[SCM] GNU Libtool branch, master, updated. v2.2.10-143-gd226dc4

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  d226dc44a3b7f92e8c393a1aac5727e3a1dbb5a8 (commit)
      from  9a99cfa036a1c9ab7e3afa8815ef79b99d80cc3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d226dc44a3b7f92e8c393a1aac5727e3a1dbb5a8
Author: Gary V. Vaughan <address@hidden>
Date:   Tue Aug 31 17:54:10 2010 +0700

    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 @address@hidden
    * 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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |   16 ++++++++++++++++
 Makefile.am                      |    7 +------
 Makefile.maint                   |    3 ---
 clcommit.m4sh                    |    4 +---
 libltdl/config/announce-gen.m4sh |    4 +---
 libltdl/config/ltmain.m4sh       |    3 +--
 libltdl/config/mailnotify.m4sh   |    4 +---
 libtoolize.m4sh                  |    4 +---
 tests/defs.m4sh                  |    3 +--
 9 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a183e2..a4c91cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-31  Gary V. Vaughan  <address@hidden>
+
+       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 @address@hidden
+       * 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  <address@hidden>
 
        Extract the archive name from the .la file and use $AR (not ar).
diff --git a/Makefile.am b/Makefile.am
index b5cde00..48fbf73 100644
--- 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 e2fa628..2e655ae 100644
--- 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 8292d6a..c189cf3 100644
--- 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 <address@hidden>
 # and Alexandre Oliva <address@hidden>
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index 38e6232..777ce9b 100644
--- 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 6948138..c31f788 100644
--- 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 <address@hidden>, 1996
 
diff --git a/libltdl/config/mailnotify.m4sh b/libltdl/config/mailnotify.m4sh
index af60de5..bbf3e03 100644
--- 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 <address@hidden>
 
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 04db82f..a58ed1e 100644
--- 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 <address@hidden>, 2003
 
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 8ffde5b..0d23dea 100644
--- 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


hooks/post-receive
-- 
GNU Libtool