From: Jani Taskinen Date: Sat, 13 Nov 2010 11:07:38 +0000 (+0000) Subject: - WS X-Git-Tag: php-5.3.4RC1~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47713462ce966174c67e4b9c28e16f573a8dd2ff;p=php - WS --- diff --git a/acinclude.m4 b/acinclude.m4 index 9a4ab82f00..2d5d57132c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2661,13 +2661,13 @@ EOF for arg in $ac_configure_args; do if test `expr -- $arg : "'.*"` = 0; then if test `expr -- $arg : "--.*"` = 0; then - break; + break; fi echo "'[$]arg' \\" >> $1 CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'" else if test `expr -- $arg : "'--.*"` = 0; then - break; + break; fi echo "[$]arg \\" >> $1 CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg" @@ -2687,19 +2687,19 @@ 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-/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-/with-/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-/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-/enable-/g' -e 's/=.*//g'`" + arg_name="`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e 's/=.*//g'`" ;; *[)] - continue + continue ;; esac case $arg_name in diff --git a/configure.in b/configure.in index c5a65e8e3a..37ea87ad72 100644 --- a/configure.in +++ b/configure.in @@ -1329,8 +1329,8 @@ dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. dnl This hack works around it. Ugly. case $host_alias in *darwin9*|*darwin10*) - ac_cv_exeext= - ;; + ac_cv_exeext= + ;; esac dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX).