From: Joe Watkins <krakjoe@php.net>
Date: Fri, 13 May 2016 06:41:11 +0000 (+0100)
Subject: fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
X-Git-Tag: php-7.0.8RC1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bb8a7b0b895af4a9e6b24101fe8fab5af64f86c;p=php

fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
---

diff --git a/acinclude.m4 b/acinclude.m4
index e828de1fd6..7105b69ec2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2690,12 +2690,24 @@ EOF
       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 $arg : ".*${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 $arg : ".*${var}.*"` != 0;
+	   then
+         continue 2
+	   fi
+      done
       echo "[$]arg \\" >> $1
       CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg"
     fi