php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #72180, #73219

Browse Source
This commit is contained in:
Joe Watkins
2016-11-20 08:32:26 +00:00
parent 56f9a93939
commit f67784907e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@@ -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