From: Joe Watkins <krakjoe@php.net>
Date: Fri, 13 May 2016 11:47:36 +0000 (+0100)
Subject: improve 7132fe19c29c512d00a3afe101212ba15fa1f99e
X-Git-Tag: php-7.0.8RC1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1524e00ccc8d99885dae0a4567b8b45a2ff44ba2;p=php

improve 7132fe19c29c512d00a3afe101212ba15fa1f99e
---

diff --git a/acinclude.m4 b/acinclude.m4
index 8afd3bd7cf..28506b6893 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,29 +2689,18 @@ EOF
   else 
     CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"
   fi
-  for arg in $ac_configure_args; do
+
+  for arg in $clean_configure_args; do
     if test `expr -- $arg : "'.*"` = 0; then
       if test `expr -- $arg : "-.*"` = 0 && test `expr -- $arg : ".*=.*"` = 0; then
         continue;
       fi
-      for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do
-       if test `expr "X$arg" : "X.*${var}.*"` != 0;
-	   then
-         continue 2
-	   fi
-      done
       echo "'[$]arg' \\" >> $1
       CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'"
     else
       if test `expr -- $arg : "'-.*"` = 0 && test `expr -- $arg : "'.*=.*"` = 0; then
         continue;
       fi
-      for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do
-       if test `expr "X$arg" : "X.*${var}.*"` != 0;
-	   then
-         continue 2
-	   fi
-      done
       echo "[$]arg \\" >> $1
       CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg"
     fi