* lib/autoconf/status.m4 (_AC_OUTPUT_FILES): Name the generated

file in @configure_input@.
Don't mention `automatically' in addition to `generated'.
* tests/torture.at (#define header templates): Adjust.

diff --git a/ChangeLog b/ChangeLog
index f996fcd93826ae0f5c1ee7c7be6ceb9566c3d05e..f92927109fa4ca513d0aecdd422cd29728af4809 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-19  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES): Name the generated
+       file in @configure_input@.
+       Don't mention `automatically' in addition to `generated'.
+       * tests/torture.at (#define header templates): Adjust.
+
 2001-10-19  Akim Demaille  <akim@epita.fr>
 
        * lib/emacs/autoconf-mode.el, lib/emacs/autotest-mode.el: In a

diff --git a/configure b/configure
index 468b6c36c0735b75591ae84fd27bc9b52a008080..03a720389508150c7993943cac48f388be5ca695 100755 (executable)
--- a/configure
+++ b/configure
@@ -1753,7 +1753,7 @@ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
-# Generated automatically by $as_me.
+# Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
@@ -2381,9 +2381,14 @@ echo "$as_me: creating $ac_file" >&6;}
   fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated automatically by config.status.  */
-  configure_input="Generated automatically from `echo $ac_file_in |
-                                                 sed 's,.*/,,'` by configure."
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input="${configure_input}Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index c375f9916fd16cd66e8b668d2b89308fe7e0212e..6745eb3a61a81653a324d4f3115d685c93ad3d70 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -623,11 +623,11 @@ dnl Now back to your regularly scheduled config.status.
 cat >>$CONFIG_STATUS <<\_ACEOF
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated automatically by config.status.  */
+  #    /* config.h.  Generated by config.status.  */
   if test x"$ac_file" = x-; then
-    echo "/* Generated automatically by configure.  */" >$tmp/config.h
+    echo "/* Generated by configure.  */" >$tmp/config.h
   else
-    echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
   fi
   cat $tmp/in >>$tmp/config.h
   rm -f $tmp/in
@@ -920,9 +920,14 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated automatically by config.status.  */
-  configure_input="Generated automatically from `echo $ac_file_in |
-                                                 sed 's,.*/,,'` by configure."
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -1225,7 +1230,7 @@ m4_define([_AC_OUTPUT_CONFIG_STATUS],
 [AC_MSG_NOTICE([creating $CONFIG_STATUS])
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
-# Generated automatically by $as_me.
+# Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.

diff --git a/tests/torture.at b/tests/torture.at
index 2beebdbafc93c493643d282aa9ecbbe967ad144b..b76afbea007d7e36a9017ae26c237d903433e32c 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -312,7 +312,7 @@ AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE
 
 AT_DATA([expout],
-[[/* config.h.  Generated automatically by configure.  */
+[[/* config.h.  Generated by configure.  */
 #define foo toto
 #  define bar tata
 #  define baz titi