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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 4ad511a0a33cf5a8a08b6c42bd70f52135c4a08b..35ca37eccf849d69e57f0d7390536665940b8403 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <Ralf.Wildenhues@gmx.de>
 
        Fix $ECHO abuse exposed by recent patch.

diff --git a/Makefile.am b/Makefile.am
index 8b19ea5747dc047f5900b0ed99a240ae9c8c6711..a09ed3d1b3b4c328a23b121221974eeda6a1ac59 100644 (file)
--- 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 8ce6ac7dc54e10caaf5414333823b6dcabb7b5cb..f8b44c18dadf5d5af988bc86d867f182654e1e81 100755 (executable)
--- 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'