* acgeneral.m4 (_AC_OUTPUT_FILES): Don't automatically spit

`Generated by...' in Makefiles.
Fixes Autoconf/102.

diff --git a/ChangeLog b/ChangeLog
index e007c5661abc04eb830514c61b9fa3074dfb0a08..9379db68895ef3408ef1baa3324441d05c92c8f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-09  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_OUTPUT_FILES): Don't automatically spit
+       `Generated by...' in Makefiles.
+       Fixes Autoconf/102.
+
 2000-05-09  Akim Demaille  <akim@epita.fr>
 
        Let `config.status' use a private temp dir.

diff --git a/acgeneral.m4 b/acgeneral.m4
index a7e3c311d2da496ed925119feba51c1d69bf87cb..c881623a341fea1a74ff7b63c2d25de4350422fe 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -4164,14 +4164,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in |
                                                  sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *[[Mm]]akefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
 
-  # Don't redirect the output to AC_FILE directly: use `mv' so that updating
-  # is atomic, and doesn't need trapping.
+  # Don't redirect the output to AC_FILE directly: use `mv' so that
+  # updating is atomic, and doesn't need trapping.
   ac_file_inputs=`echo "$ac_file_in" |
                   sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"`
   for ac_file_input in $ac_file_inputs;
@@ -4181,9 +4176,8 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   done
 EOF
 cat >>$CONFIG_STATUS <<EOF
-  sed -e "$ac_comsub
 dnl Neutralize VPATH when `$srcdir' = `.'.
-$ac_vpsub
+  sed -e "$ac_vpsub
 dnl Shell code in configure.in might set extrasub.
 dnl FIXME: do we really want to maintain this feature?
 $extrasub

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index a0c2b1350a1587b0380b6680aab7962a502fcf45..2a8914decc1cf21e1ff63703eaef1e90d3bbbe6a 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -6751,8 +6751,7 @@ your @file{Makefile.in} files, so they can take advantage of the values
 of those variables in the environment when @code{configure} is run.
 Doing this isn't necessary, but it's a convenience for users.
 
-Also add @samp{@@configure_input@@} in a comment to each non-@file{Makefile}
-input file for
+Also add @samp{@@configure_input@@} in a comment to each input file for
 @code{AC_OUTPUT}, so that the output files will contain a comment saying
 they were produced by @code{configure}.  Automatically selecting the
 right comment syntax for all the kinds of files that people call

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index a7e3c311d2da496ed925119feba51c1d69bf87cb..c881623a341fea1a74ff7b63c2d25de4350422fe 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -4164,14 +4164,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in |
                                                  sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *[[Mm]]akefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
 
-  # Don't redirect the output to AC_FILE directly: use `mv' so that updating
-  # is atomic, and doesn't need trapping.
+  # Don't redirect the output to AC_FILE directly: use `mv' so that
+  # updating is atomic, and doesn't need trapping.
   ac_file_inputs=`echo "$ac_file_in" |
                   sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"`
   for ac_file_input in $ac_file_inputs;
@@ -4181,9 +4176,8 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   done
 EOF
 cat >>$CONFIG_STATUS <<EOF
-  sed -e "$ac_comsub
 dnl Neutralize VPATH when `$srcdir' = `.'.
-$ac_vpsub
+  sed -e "$ac_vpsub
 dnl Shell code in configure.in might set extrasub.
 dnl FIXME: do we really want to maintain this feature?
 $extrasub