jani Wed Jul 11 15:16:56 2007 UTC Modified files: (Branch: PHP_5_2) /php-src acinclude.m4 Log: - Introducing 1st part of "show unknown configure options" and nuked PHP_REGEX macro for good http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.18&r2=1.332.2.14.2.19&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.18 php-src/acinclude.m4:1.332.2.14.2.19 --- php-src/acinclude.m4:1.332.2.14.2.18 Tue Jul 10 10:18:48 2007 +++ php-src/acinclude.m4 Wed Jul 11 15:16:56 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.18 2007/07/10 10:18:48 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.19 2007/07/11 15:16:56 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2560,28 +2560,50 @@ ]) dnl -dnl PHP_REGEX +dnl PHP_CHECK_CONFIGURE_OPTIONS dnl -AC_DEFUN([PHP_REGEX],[ - if test "$REGEX_TYPE" = "php"; then - AC_DEFINE(HAVE_REGEX_T_RE_MAGIC, 1, [ ]) - AC_DEFINE(HSREGEX,1,[ ]) - AC_DEFINE(REGEX,1,[ ]) - PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c) - elif test "$REGEX_TYPE" = "system"; then - AC_DEFINE(REGEX,0,[ ]) - dnl Check if field re_magic exists in struct regex_t - AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], ac_cv_regex_t_re_magic, [ - AC_TRY_COMPILE([#include <sys/types.h> -#include <regex.h>], [regex_t rt; rt.re_magic;], - [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no]) - ]) - if test "$ac_cv_regex_t_re_magic" = "yes"; then - AC_DEFINE([HAVE_REGEX_T_RE_MAGIC], [ ], 1) - fi - fi - AC_MSG_CHECKING([which regex library to use]) - AC_MSG_RESULT([$REGEX_TYPE]) +AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[ + for arg in $ac_configure_args; do + case $arg in + --with-*[)] + arg_name="`echo [$]arg | $SED -e 's/--with-//g' -e 's/=.*//g'`" + ;; + --without-*[)] + arg_name="`echo [$]arg | $SED -e 's/--without-//g' -e 's/=.*//g'`" + ;; + --enable-*[)] + arg_name="`echo [$]arg | $SED -e 's/--enable-//g' -e 's/=.*//g'`" + ;; + --disable-*[)] + arg_name="`echo [$]arg | $SED -e 's/--disable-//g' -e 's/=.*//g'`" + ;; + *[)] + continue + ;; + esac + case $arg_name in + # Allow --disable-all / --enable-all + all[)];; + + # Allow certain libtool options + libtool-lock | pic | tags | shared | static | fast-install | gnu-ld[)];; + + # Allow certain TSRM options + tsrm-pth | tsrm-st | tsrm-pthreads[)];; + + # Allow certain Zend options + zend-vm | maintainer-zts | inline-optimization | zend-multibyte[)];; + + # All the rest must be set using the PHP_ARG_* macros + *[)] + 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" + fi + ;; + esac + done ]) dnl
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php