Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60).

diff --git a/NEWS b/NEWS
index 2182ee1a9f741a6e8382fda8621fedc38c20ae34..9ba7c7fe7b75e4fe64dd29269da3d780bc09531c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Fixed mess with CGI/CLI -d option (now it works with cgi; constants are
   working exactly like in php.ini; with FastCGI -d affects all requests).
   (Dmitry)
+- Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60).
+  (Ilia)
 - Fixed bug #39003 (__autoload() is called for type hinting). (Dmitry, Tony)
 - Fixed bug #39001 (ReflectionProperty returns incorrect declaring class for 
   protected properties). (Tony)

diff --git a/acinclude.m4 b/acinclude.m4
index dd475b28cf59e76495a1923c29d9eb5f83f55477..9df69fa67a1b90e6f62dd19e19fc694db345ac22 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2503,9 +2503,21 @@ EOF
     fi
   done
 
-  for arg in [$]0 "[$]@"; do
-    echo "'[$]arg' \\" >> $1
-    CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'"
+  echo "'[$]0'" >> $1
+  for arg in $ac_configure_args; do
+     if test `expr substr $arg 1 1` != "'"; then
+        if test `expr substr $arg 1 2` != '--'; then
+                 break;
+        fi
+        echo "'[$]arg' \\" >> $1
+        CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'"
+     else
+       if test `expr substr $arg 2 2` != '--'; then
+                 break;
+        fi
+        echo "[$]arg \\" >> $1
+        CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]arg"
+     fi
   done
   echo '"[$]@"' >> $1
   chmod +x $1