Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6BF06200D71 for ; Thu, 21 Dec 2017 04:41:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6A4CF160C18; Thu, 21 Dec 2017 03:41:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B06F4160C15 for ; Thu, 21 Dec 2017 04:41:49 +0100 (CET) Received: (qmail 86348 invoked by uid 500); 21 Dec 2017 03:41:48 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 86331 invoked by uid 99); 21 Dec 2017 03:41:48 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Dec 2017 03:41:48 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 83C613A00E7 for ; Thu, 21 Dec 2017 03:41:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1818871 - in /subversion/trunk/build/ac-macros: lz4.m4 utf8proc.m4 Date: Thu, 21 Dec 2017 03:41:45 -0000 To: commits@subversion.apache.org From: jamessan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171221034147.83C613A00E7@svn01-us-west.apache.org> archived-at: Thu, 21 Dec 2017 03:41:50 -0000 Author: jamessan Date: Thu Dec 21 03:41:44 2017 New Revision: 1818871 URL: http://svn.apache.org/viewvc?rev=1818871&view=rev Log: Don't use a prefix of "yes" for lz4/utf8proc detection The --with-{lz4,utf8proc} configure switches have 3 supported uses (--with-, --with-=internal, --with-=PREFIX). Using "--with-" was setting the prefix to "yes", when it should have been using the "std" detection. * build/ac-macros/lz4.m4 (SVN_LZ4): Correctly set lz4_prefix with "--with-lz4" * build/ac-macros/utf8proc.m4 (SVN_UTF8PROC): Correctly set utf8proc_prefix with "--with-utf8proc" Modified: subversion/trunk/build/ac-macros/lz4.m4 subversion/trunk/build/ac-macros/utf8proc.m4 Modified: subversion/trunk/build/ac-macros/lz4.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/lz4.m4?rev=1818871&r1=1818870&r2=1818871&view=diff ============================================================================== --- subversion/trunk/build/ac-macros/lz4.m4 (original) +++ subversion/trunk/build/ac-macros/lz4.m4 Thu Dec 21 03:41:44 2017 @@ -28,7 +28,15 @@ AC_DEFUN(SVN_LZ4, AC_ARG_WITH([lz4], [AS_HELP_STRING([--with-lz4=PREFIX|internal], [look for lz4 in PREFIX or use the internal code])], - [lz4_prefix="$withval"], + [ + if test "$withval" = internal; then + lz4_prefix=internal + elif test "$withval" = yes; then + lz4_prefix=std + else + lz4_prefix="$withval" + fi + ], [lz4_prefix=std]) if test "$lz4_prefix" = "internal"; then Modified: subversion/trunk/build/ac-macros/utf8proc.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/utf8proc.m4?rev=1818871&r1=1818870&r2=1818871&view=diff ============================================================================== --- subversion/trunk/build/ac-macros/utf8proc.m4 (original) +++ subversion/trunk/build/ac-macros/utf8proc.m4 Thu Dec 21 03:41:44 2017 @@ -28,7 +28,15 @@ AC_DEFUN(SVN_UTF8PROC, AC_ARG_WITH([utf8proc], [AS_HELP_STRING([--with-utf8proc=PREFIX|internal], [look for utf8proc in PREFIX or use the internal code])], - [utf8proc_prefix="$withval"], + [ + if test "$withval" = internal; then + utf8proc_prefix=internal + elif test "$withval" = yes; then + utf8proc_prefix=std + else + utf8proc_prefix="$withval" + fi + ], [utf8proc_prefix=std]) if test "$utf8proc_prefix" = "internal"; then