From: Michael Wallner <mike@php.net>
Date: Fri, 2 Aug 2013 11:09:06 +0000 (+0200)
Subject: fix generating config.nice
X-Git-Tag: php-5.6.0alpha1~355
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8bc18420702e1b4fa524d21eae804cd6004879e;p=php

fix generating config.nice

Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
---

diff --git a/acinclude.m4 b/acinclude.m4
index 07b1f8eb57..fb490594d4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2686,14 +2686,14 @@ EOF
   fi
   for arg in $ac_configure_args; do
     if test `expr -- $arg : "'.*"` = 0; then
-      if test `expr -- $arg : "--.*"` = 0; then
-        break;
+      if test `expr -- $arg : "-.*"` = 0 && test `expr -- $arg : ".*=.*"` = 0; then
+        continue;
       fi
       echo "'[$]arg' \\" >> $1
       CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'"
     else
-      if test `expr -- $arg : "'--.*"` = 0; then
-        break;
+      if test `expr -- $arg : "'-.*"` = 0 && test `expr -- $arg : "'.*=.*"` = 0; then
+        continue;
       fi
       echo "[$]arg \\" >> $1
       CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg"