* acgeneral.m4 (_AC_INIT_PREPARE): Insert the Autoconf version in

config.log, and the command line which ran configure.
Kill a couple of useless quote around dollars.

diff --git a/ChangeLog b/ChangeLog
index bd1fbc6e18f15911434f09ee189918a41a1016c4..873a65c174b28d331647d9cb9532e1f3c3ff78e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-14  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_INIT_PREPARE): Insert the Autoconf version in
+       config.log, and the command line which ran configure.
+       Kill a couple of useless quote around dollars.
+
 2000-03-14  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_INIT_PREPARE): Kill a changequote in the

diff --git a/acgeneral.m4 b/acgeneral.m4
index eb24ed008c333a1267dc4b77c1171ebc9d02c8a7..2259898e6d8620ab21d6d0065ed7f650247f1a15 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1142,6 +1142,26 @@ AC_DEFUN([_AC_INIT_PREPARE],
 [AC_DIVERT_PUSH([INIT_PREPARE])dnl
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+dnl If you change this globbing pattern, test it on an old shell --
+dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
+[  *" "*|*"    "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)]
+  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
 # File descriptor usage:
 # 0 standard input
 # 1 file creation
@@ -1162,26 +1182,10 @@ exec AC_FD_CC>./config.log
 echo "\
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-" 1>&AC_FD_CC
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-dnl If you change this globbing pattern, test it on an old shell --
-dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
-[  *" "*|*"    "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)]
-  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
+It was created by configure version AC_ACVERSION, executed with
+ > [$]0 $ac_configure_args
+" 1>&AC_FD_CC
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally
@@ -3610,7 +3614,7 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 dnl so uname gets run too.
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-@%:@ [$]0 [$]ac_configure_args
+@%:@ [$]0 $ac_configure_args
 #
 # Compiler output produced by configure, useful for debugging
 # configure, is in ./config.log if it exists.
@@ -3672,7 +3676,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 ac_cs_version="\\
 $CONFIG_STATUS generated by autoconf version AC_ACVERSION.
 Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by
-  `echo "[$]0 [$]ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'`"
+  `echo "[$]0 $ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'`"
 
 dnl We use a different name than CONFTEST just to help the maintainers
 dnl to make the difference between `conftest' which is the root of the
@@ -3707,9 +3711,12 @@ do
 
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-dnl FIXME: This line is suspicious, it contains "" inside a "`...`".
-    echo "running [\$]{CONFIG_SHELL-/bin/sh} [$]0 `echo "[$]ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'` --no-create --no-recursion"
-    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create --no-recursion ;;
+dnl The following line is extremely suspicious: there are double quotes
+dnl inside a "`...`" (which is not portable).  But it is actually safe,
+dnl since we are in an unquoted here doc, which will skip the outer pair
+dnl of double quotes, and only eval the back quotes.
+    echo "running [\$]{CONFIG_SHELL-/bin/sh} [$]0 `echo "$ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'` --no-create --no-recursion"
+    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "[\$]ac_cs_version"; exit 0 ;;
   --he | --h)

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index eb24ed008c333a1267dc4b77c1171ebc9d02c8a7..2259898e6d8620ab21d6d0065ed7f650247f1a15 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1142,6 +1142,26 @@ AC_DEFUN([_AC_INIT_PREPARE],
 [AC_DIVERT_PUSH([INIT_PREPARE])dnl
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+dnl If you change this globbing pattern, test it on an old shell --
+dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
+[  *" "*|*"    "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)]
+  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
 # File descriptor usage:
 # 0 standard input
 # 1 file creation
@@ -1162,26 +1182,10 @@ exec AC_FD_CC>./config.log
 echo "\
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-" 1>&AC_FD_CC
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-dnl If you change this globbing pattern, test it on an old shell --
-dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
-[  *" "*|*"    "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)]
-  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
+It was created by configure version AC_ACVERSION, executed with
+ > [$]0 $ac_configure_args
+" 1>&AC_FD_CC
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally
@@ -3610,7 +3614,7 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 dnl so uname gets run too.
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-@%:@ [$]0 [$]ac_configure_args
+@%:@ [$]0 $ac_configure_args
 #
 # Compiler output produced by configure, useful for debugging
 # configure, is in ./config.log if it exists.
@@ -3672,7 +3676,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 ac_cs_version="\\
 $CONFIG_STATUS generated by autoconf version AC_ACVERSION.
 Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by
-  `echo "[$]0 [$]ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'`"
+  `echo "[$]0 $ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'`"
 
 dnl We use a different name than CONFTEST just to help the maintainers
 dnl to make the difference between `conftest' which is the root of the
@@ -3707,9 +3711,12 @@ do
 
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-dnl FIXME: This line is suspicious, it contains "" inside a "`...`".
-    echo "running [\$]{CONFIG_SHELL-/bin/sh} [$]0 `echo "[$]ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'` --no-create --no-recursion"
-    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create --no-recursion ;;
+dnl The following line is extremely suspicious: there are double quotes
+dnl inside a "`...`" (which is not portable).  But it is actually safe,
+dnl since we are in an unquoted here doc, which will skip the outer pair
+dnl of double quotes, and only eval the back quotes.
+    echo "running [\$]{CONFIG_SHELL-/bin/sh} [$]0 `echo "$ac_configure_args" | sed 's/[[\\"\`\$]]/\\\\&/g'` --no-create --no-recursion"
+    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "[\$]ac_cs_version"; exit 0 ;;
   --he | --h)