diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-05-13 07:41:11 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-05-13 07:41:11 +0100 |
| commit | 1bb8a7b0b895af4a9e6b24101fe8fab5af64f86c (patch) | |
| tree | 668439e87a1f2c26530af88dc5019e3f8c4939c0 /acinclude.m4 | |
| parent | f751b1ceafe6666cc54151eb8ca9d8b47ae2d077 (diff) | |
| download | php-git-1bb8a7b0b895af4a9e6b24101fe8fab5af64f86c.tar.gz | |
fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 12 insertions, 0 deletions
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 |