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-<lib>, --with-<lib>=internal, --with-<lib>=PREFIX). Using
"--with-<lib>" 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
