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

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