jani Mon Jul 16 10:00:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src acinclude.m4
Log:
- Fix issue in differentiating between --with-* and --enable-*
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.20&r2=1.332.2.14.2.21&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.20
php-src/acinclude.m4:1.332.2.14.2.21
--- php-src/acinclude.m4:1.332.2.14.2.20 Wed Jul 11 17:36:55 2007
+++ php-src/acinclude.m4 Mon Jul 16 10:00:44 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.20 2007/07/11 17:36:55 johannes Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.21 2007/07/16 10:00:44 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -696,6 +696,7 @@
dnl the PHP_ARG_ANALYZE_EX.
dnl
AC_DEFUN([PHP_ARG_WITH],[
+php_with_[]translit($1,A-Z0-9-,a-z0-9_)=ifelse($4,,no,$4)
PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_),[ifelse($5,,yes,$5)])
])
@@ -723,7 +724,8 @@
dnl the PHP_ARG_ANALYZE_EX.
dnl
AC_DEFUN([PHP_ARG_ENABLE],[
-PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_),[ifelse($5,,yes,$5)])
+php_enable_[]translit($1,A-Z0-9-,a-z0-9_)=ifelse($4,,no,$4)
+PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_),[ifelse($5,,yes,$5)])
])
dnl PHP_REAL_ARG_ENABLE
@@ -2563,16 +2565,16 @@
for arg in $ac_configure_args; do
case $arg in
--with-*[)]
- arg_name="`echo [$]arg | $SED -e 's/--with-//g' -e 's/=.*//g'`"
+ arg_name="`echo [$]arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`"
;;
--without-*[)]
- arg_name="`echo [$]arg | $SED -e 's/--without-//g' -e 's/=.*//g'`"
+ arg_name="`echo [$]arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`"
;;
--enable-*[)]
- arg_name="`echo [$]arg | $SED -e 's/--enable-//g' -e 's/=.*//g'`"
+ arg_name="`echo [$]arg | $SED -e 's/--enable-/enable-/g' -e 's/=.*//g'`"
;;
--disable-*[)]
- arg_name="`echo [$]arg | $SED -e 's/--disable-//g' -e 's/=.*//g'`"
+ arg_name="`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e
's/=.*//g'`"
;;
*[)]
continue
@@ -2580,20 +2582,21 @@
esac
case $arg_name in
# Allow --disable-all / --enable-all
- all[)];;
+ enable-all[)];;
# Allow certain libtool options
- libtool-lock | pic | tags | shared | static | fast-install | gnu-ld[)];;
+ enable-libtool-lock | with-pic | with-tags | enable-shared |
enable-static | enable-fast-install | with-gnu-ld[)];;
# Allow certain TSRM options
- tsrm-pth | tsrm-st | tsrm-pthreads[)];;
+ with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads[)];;
# Allow certain Zend options
- zend-vm | maintainer-zts | inline-optimization | zend-multibyte[)];;
+ with-zend-vm | enable-maintainer-zts | enable-inline-optimization |
enable-zend-multibyte[)];;
# All the rest must be set using the PHP_ARG_* macros
+ # PHP_ARG_* macros set php_enable_<arg_name> or php_with_<arg_name>
*[)]
- is_arg_set=PHP_[]`echo [$]arg_name | tr 'abcdefghijklmnopqrstuvwxyz-'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+ is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-'
'abcdefghijklmnopqrstuvwxyz_'`
if eval test -z "\$$is_arg_set"; then
PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS
[$]arg"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
