* bootstrap (ltconfig): When bootstrapping libtool with a

stock automake (i.e. without the README patch applied),
references to ltconfig are manually removed from the generated
Makefile.in files.

diff --git a/ChangeLog b/ChangeLog
index 2025fff9a04cac66391355d28ccb6c2955a79dbd..2b9d48ab8c6eafb7320bd175759fa8a17f611be1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-16  Gary V. Vaughan  <gvv@techie.com>
+
+       * bootstrap (ltconfig): When bootstrapping libtool with a
+       stock automake (i.e. without the README patch applied),
+       references to ltconfig are manually removed from the generated
+       Makefile.in files.
+
 2000-09-15  Gary V. Vaughan  <gvv@techie.com>
 
        * doc/libtool.texi: Removes references to ltconfig, and a small

diff --git a/bootstrap b/bootstrap
index 72a62c86a86d6ddbbd1d39d7cf168a0b13705481..941cb89185df46c4251c7f91eacbd2f5ada19719 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -3,6 +3,8 @@
 # helps bootstrapping libtool, when checked out from CVS
 # requires GNU autoconf and GNU automake
 
+file=Makefile.in
+
 rm -f acinclude.m4
 ln -s libtool.m4 acinclude.m4
 # fake the libtool scripts
@@ -11,6 +13,7 @@ touch ltconfig
 touch libtoolize
 aclocal
 automake --gnu --add-missing --copy
+sed 's/ ltconfig//' < $file > ${file}T && mv ${file}T $file || rm -f ${file}T
 autoconf
 
 for sub in libltdl demo depdemo mdemo cdemo; do
@@ -21,6 +24,7 @@ for sub in libltdl demo depdemo mdemo cdemo; do
   aclocal
   test "$sub" = libltdl && autoheader
   automake --gnits --add-missing
+  sed 's/ ltconfig//' < $file > ${file}T && mv ${file}T $file || rm -f ${file}T
   autoconf
   cd ..
 done