Remove double `Generated from foo.m4sh' lines.

We now require a modern Autoconf to bootstrap libtool, which
will add the `Generated by ...' boiler-plate automatically,
so we can remove the hand-rolled @configure_input@
substitutions we had been doing:
* clcommit.m4sh, libtoolize.m4sh, tests/defs.sh,
libltdl/config/announce-gen.m4sh, libltdl/config/ltmain.m4sh,
libltdl/config/mailnotify.m4sh: Remove @configure_input@.
* Makefile.am (edit): Remove configure_input substitution.
(libtoolize, libltdl/config/ltmain.sh, libltdl/m4/ltversion.m4)
(tests/defs): Don't set `$input' shell variable.
* Makefile.maint (announce_gen, libltdl/config/mailnotify)
(commit): Likewise.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index 8a183e2451fcd529c68865ffec903602e7068fca..a4c91cb6b8ec270239cb3d696ddf16fe0fd38e8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-31  Gary V. Vaughan  <gary@gnu.org>
+
+       Remove double `Generated from foo.m4sh' lines.
+       We now require a modern Autoconf to bootstrap libtool, which
+       will add the `Generated by ...' boiler-plate automatically,
+       so we can remove the hand-rolled @configure_input@
+       substitutions we had been doing:
+       * clcommit.m4sh, libtoolize.m4sh, tests/defs.sh,
+       libltdl/config/announce-gen.m4sh, libltdl/config/ltmain.m4sh,
+       libltdl/config/mailnotify.m4sh: Remove @configure_input@.
+       * Makefile.am (edit): Remove configure_input substitution.
+       (libtoolize, libltdl/config/ltmain.sh, libltdl/m4/ltversion.m4)
+       (tests/defs): Don't set `$input' shell variable.
+       * Makefile.maint (announce_gen, libltdl/config/mailnotify)
+       (commit): Likewise.
+
 2010-08-31  Peter Rosin  <peda@lysator.liu.se>
 
        Extract the archive name from the .la file and use $AR (not ar).

diff --git a/Makefile.am b/Makefile.am
index b5cde003a19b9faee81fc104238ac4f99c3e458d..48fbf73c2bc1df96cbca16b65a21590a2d132fc1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,6 @@ bin_SCRIPTS = libtoolize libtool
 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
        rm -f libtoolize.tmp libtoolize
        $(timestamp); \
-       input="libtoolize.m4sh"; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
                -e 's,@aclocal_DATA\@,$(aclocalfiles),g' \
                -e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
@@ -137,8 +136,7 @@ edit = sed \
        -e 's,@datadir\@,$(datadir),g' \
        -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
        -e 's,@host_triplet\@,$(host_triplet),g' \
-       -e 's,@prefix\@,$(prefix),g' \
-       -e "s,@configure_input\@,Generated from $$input.,g"
+       -e 's,@prefix\@,$(prefix),g'
 
 sh_files       = $(auxdir)/general.m4sh $(auxdir)/getopt.m4sh
 EXTRA_DIST     += bootstrap $(srcdir)/libtoolize.in $(auxdir)/ltmain.m4sh \
@@ -176,7 +174,6 @@ $(srcdir)/$(m4dir)/ltversion.m4: $(m4dir)/ltversion.in configure.ac ChangeLog
          cd $(srcdir); \
          rm -f $(m4dir)/ltversion.tmp; \
          serial=`echo "$$correctver" | sed 's,^1[.],,g'`; \
-         input="ltversion.in"; \
          echo $(edit) -e "s,@MACRO_REVISION\@,$$correctver,g" \
            -e "s,@MACRO_SERIAL\@,$$serial,g" \
            $(srcdir)/$(m4dir)/ltversion.in \> $(srcdir)/$(m4dir)/ltversion.m4; \
@@ -216,7 +213,6 @@ $(srcdir)/$(auxdir)/ltmain.sh: $(sh_files) $(auxdir)/ltmain.m4sh configure.ac Ch
            \> $(auxdir)/ltmain.in; \
          $(M4SH) -B $(auxdir) $(auxdir)/ltmain.m4sh \
            > $(auxdir)/ltmain.in; \
-         input="ltmain.m4sh"; \
          echo $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
            -e "s,@package_revision\@,$$correctver," \
            $(srcdir)/$(auxdir)/ltmain.in "> $$target"; \
@@ -897,7 +893,6 @@ DIST_SUBDIRS   += $(CONF_SUBDIRS)
 check-recursive: tests/defs
 tests/defs: $(srcdir)/tests/defs.in
        rm -f tests/defs.tmp tests/defs; \
-       input="defs.m4sh"; \
        $(edit) $(srcdir)/tests/defs.in > tests/defs.tmp; \
        mv -f tests/defs.tmp tests/defs
 

diff --git a/Makefile.maint b/Makefile.maint
index e2fa628169f7461c0e82da3f9e7f1187120000c4..2e655aebe49af802c1dfb79e33eaa4b79b4b52d3 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -41,7 +41,6 @@ $(srcdir)/commit: $(srcdir)/$(auxdir)/mailnotify clcommit.m4sh
        cd $(srcdir); \
        rm -f commit commit.in commit.tmp; \
        $(M4SH) -B $(auxdir) clcommit.m4sh > commit.in; \
-       input="clcommit.m4sh"; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" commit.in > commit.tmp; \
        chmod a+x commit.tmp; \
        chmod a-w commit.tmp; \
@@ -52,7 +51,6 @@ announce-gen: $(auxdir)/announce-gen.m4sh $(auxdir)/getopt.m4sh
        $(timestamp); \
        rm -f announce-gen announce-gen.in announce-gen.tmp; \
        $(M4SH) -B $(top_srcdir)/$(auxdir) $(top_srcdir)/$(auxdir)/announce-gen.m4sh > announce-gen.in; \
-       input="announce-gen.m4sh"; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
                -e "s,@LASTRELEASE\@,$(LASTRELEASE),g" \
                -e "s,@top_srcdir\@,$(top_srcdir),g" \
@@ -67,7 +65,6 @@ $(srcdir)/$(auxdir)/mailnotify: $(auxdir)/mailnotify.m4sh
        cd $(srcdir)/$(auxdir); \
        rm -f mailnotify mailnotify.in mailnotify.tmp; \
        $(M4SH) -B . mailnotify.m4sh > mailnotify.in; \
-       input="mailnotify.m4sh"; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
                mailnotify.in > mailnotify.tmp; \
        chmod a+x mailnotify.tmp; \

diff --git a/clcommit.m4sh b/clcommit.m4sh
index 8292d6a665a616d82b98c992f6e43041e1b68a9b..c189cf3f733b53c1e76d6c54a87283947b06ff78 100644 (file)
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -1,6 +1,4 @@
-AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
-# @configure_input@
-
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
 # clcommit (GNU @PACKAGE@) version 2.1
 # Written by Gary V. Vaughan <gary@gnu.org>
 # and Alexandre Oliva <aoliva@redhat.com>

diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index 38e62323ca711f0e2686b3de180bcca6f0d4ebd8..777ce9b4499c4b5723f58c9dcc91fec6a135fd1b 100644 (file)
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -1,6 +1,4 @@
-AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
-# @configure_input@
-
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
 # announce-gen (GNU @PACKAGE@) version 1.0
 # Written by Gary V. Vaughan 
 # based on a perl script by Jim Meyering

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 6948138da83e8b68f470fb6864557e94f56b861d..c31f7883e74689d867d7761a0a9cbe055e0ea7d8 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1,6 +1,5 @@
 m4_define([_m4_divert(SCRIPT)], 100)
-m4_divert_push([SCRIPT])# @configure_input@
-
+m4_divert_push([SCRIPT])
 # libtool (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 

diff --git a/libltdl/config/mailnotify.m4sh b/libltdl/config/mailnotify.m4sh
index af60de566630b3e47eae67764b1108593f5c1161..bbf3e03aa61154203ce145cecb60f2a404e45fd5 100644 (file)
--- a/libltdl/config/mailnotify.m4sh
+++ b/libltdl/config/mailnotify.m4sh
@@ -1,6 +1,4 @@
-AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
-# @configure_input@
-
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
 # mailnotify (GNU @PACKAGE@) version 1.0
 # Written by Gary V. Vaughan <gary@gnu.org>
 

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 04db82f1846b6020a7e57f50bfed2d32e4855097..a58ed1e41985e08c477973aff61c040c72c94633 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1,7 +1,5 @@
 m4_pattern_allow([dnl])
-AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
-# @configure_input@
-
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
 # libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
 # Written by Gary V. Vaughan <gary@gnu.org>, 2003
 

diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 8ffde5b05c4ade32250e4ad6339b1bae9569c444..0d23deae1ca26753ddf805e71276d6c9861eac05 100644 (file)
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -1,5 +1,4 @@
-AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
-# @configure_input@
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
 # defs -- Defines for Libtool testing environment.
 #
 #   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software