[SCM] GNU Libtool branch, master, updated. v2.2.6-34-g3745830

[Ralf Wildenhues]

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  3745830dcbc27ed4f4a760850713e721f326be64 (commit)
      from  d885f7721320c1ac77c29b0f0313a84622924188 (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 3745830dcbc27ed4f4a760850713e721f326be64
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Nov 20 07:13:36 2008 +0100

    Check for bogus aclocal.m4 contents in bootstrap and dist-hook.
    
    * Makefile.am (dist-hook): Bail out if shipped aclocal.m4 files
    contain LT_INIT, AC_PROG_LIBTOOL, or AM_PROG_LIBTOOL macro
    definitions.  These can only come from bogus pull-ins from older
    installed Libtool macro files.
    * bootstrap: Likewise.
    Report by Akim Demaille.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog   |   10 ++++++++++
 Makefile.am |    7 +++++++
 bootstrap   |    7 +++++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ad511a..35ca37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-20  Ralf Wildenhues  <address@hidden>
+
+       Check for bogus aclocal.m4 contents in bootstrap and dist-hook.
+       * Makefile.am (dist-hook): Bail out if shipped aclocal.m4 files
+       contain LT_INIT, AC_PROG_LIBTOOL, or AM_PROG_LIBTOOL macro
+       definitions.  These can only come from bogus pull-ins from older
+       installed Libtool macro files.
+       * bootstrap: Likewise.
+       Report by Akim Demaille.
+
 2008-11-16  Ralf Wildenhues  <address@hidden>
 
        Fix $ECHO abuse exposed by recent patch.
diff --git a/Makefile.am b/Makefile.am
index 8b19ea5..a09ed3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -433,6 +433,13 @@ dist-hook:
        case $(VERSION) in \
          *[a-z]) cp -p $(srcdir)/README.alpha $(distdir)/README ;; \
        esac; else :; fi
+## Ensure aclocal has not wrongly picked up old macro definitions.
+       for macro in LT_INIT AC_PROG_LIBTOOL AM_PROG_LIBTOOL; do \
+         if grep $$macro $(srcdir)/aclocal.m4 $(srcdir)/libltdl/aclocal.m4; 
then \
+           echo "Bogus $$macro macro contents in an aclocal.m4 file." >&2; \
+           exit 1; \
+         else :; fi; \
+       done
 
 
 ## ----------- ##
diff --git a/bootstrap b/bootstrap
index 8ce6ac7..f8b44c1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -183,6 +183,13 @@ rm -f Makefile libltdl/Makefile libtool vcl.tmp
 # to be regenerated at make-time with proper substitutions in place:
 touch $auxdir/ltmain.m4sh
 
+for macro in LT_INIT AC_PROG_LIBTOOL AM_PROG_LIBTOOL; do
+  if grep $macro aclocal.m4 libltdl/aclocal.m4; then
+    echo "Bogus $macro macro contents in an aclocal.m4 file." >&2
+    exit 1
+  else :; fi
+done
+
 # Commit script caveat:
 cat <<EOF
 WARNING: You might want to regenerate \`commit' and \`$auxdir/mailnotify'


hooks/post-receive
--
GNU Libtool