diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-20 08:32:26 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-20 08:32:26 +0000 |
| commit | f67784907e2a4b39b47a4e05d8dfd315cd7ee616 (patch) | |
| tree | b4d47e8ce8f81006d10dcb34f6afcfdf7ca12a65 /acinclude.m4 | |
| parent | 56f9a93939a96f93210809e99fe1d4f536b56b2d (diff) | |
| download | php-git-f67784907e2a4b39b47a4e05d8dfd315cd7ee616.tar.gz | |
fix #72180, #73219
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e6d84e5b83..c59eba4998 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2672,10 +2672,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 @@ -2685,7 +2689,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 *\('[[^']]*'\)"` @@ -2698,12 +2702,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 |