From: Joe Watkins <krakjoe@php.net>
Date: Sun, 20 Nov 2016 08:32:26 +0000 (+0000)
Subject: fix #72180, #73219
X-Git-Tag: php-7.2.0alpha1~874^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f67784907e2a4b39b47a4e05d8dfd315cd7ee616;p=php

fix #72180, #73219
---

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