diff options
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 88c97961c7..64d2dd07c9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2661,10 +2661,14 @@ AC_DEFUN([PHP_CONFIG_NICE],[ EOF + clean_configure_args=$ac_configure_args for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do eval val=\$$var if test -n "$val"; then echo "$var='$val' \\" >> $1 + if test `expr "X$ac_configure_args" : ".*${var}.*"` != 0; then + clean_configure_args=$(echo $clean_configure_args | sed -e "s#'$var=$val'##") + fi fi done @@ -2674,7 +2678,7 @@ EOF else CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" fi - CONFIGURE_ARGS="$ac_configure_args" + CONFIGURE_ARGS="$clean_configure_args" while test "X$CONFIGURE_ARGS" != "X"; do if CURRENT_ARG=`expr "X$CONFIGURE_ARGS" : "X *\('[[^']]*'\)"` @@ -2687,12 +2691,6 @@ EOF else break fi - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do - if test `expr "X$CURRENT_ARG" : "X.*${var}.*"` != 0; - then - continue 2 - fi - done $as_echo "$CURRENT_ARG \\" >>$1 CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" done |