diff options
| author | foobar <sniper@php.net> | 2007-06-29 01:10:35 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2007-06-29 01:10:35 +0000 |
| commit | 4d63c096619ef93601a149c37b84f3e439c26ec4 (patch) | |
| tree | e68dfcef0d7212d6652c3654fd44ad1f4f82bace /acinclude.m4 | |
| parent | d34bfe5c37e45e80bae7eeb35a4ca1175636c6e9 (diff) | |
| download | php-git-4d63c096619ef93601a149c37b84f3e439c26ec4.tar.gz | |
MFH:- Improved php-config:
MFH: . Added --configure-options option to get configure line for current build
MFH: . Added --php-sapis option which shows SAPIs available
MFH: . Fixed problem with missing php binary when CLI is not build but CGI is.
MFH:- Fixed broken sed issues in phpize script
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d015a024ad..8d59cb476d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2523,8 +2523,8 @@ dnl AC_DEFUN([PHP_CONFIG_NICE],[ AC_REQUIRE([AC_PROG_EGREP]) AC_REQUIRE([LT_AC_PROG_SED]) - PHP_SUBST(EGREP) - PHP_SUBST(SED) + PHP_SUBST_OLD(EGREP) + PHP_SUBST_OLD(SED) test -f $1 && mv $1 $1.old rm -f $1.old cat >$1<<EOF @@ -2553,18 +2553,20 @@ EOF break; fi echo "'[$]arg' \\" >> $1 - CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'" else if test `expr -- $arg : "'--.*"` = 0; then break; fi echo "[$]arg \\" >> $1 - CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]arg" + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg" fi done echo '"[$]@"' >> $1 chmod +x $1 + CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS" PHP_SUBST_OLD(CONFIGURE_COMMAND) + PHP_SUBST_OLD(CONFIGURE_OPTIONS) ]) dnl |