* bootstrap: Update warning message to reflect having split

libtool.m4 into several files.
Also, add config/ltmain.sh to list of stale files from previous
versions to be removed before bootstrap.

diff --git a/ChangeLog b/ChangeLog
index 6ba135421818ff47ddfba427acfac4830b5b593f..0631badf3305199a726b8dd631e422bfc86e70fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-08-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * bootstrap: Update warning message to reflect having split
+       libtool.m4 into several files.
+       Also, add config/ltmain.sh to list of stale files from previous
+       versions to be removed before bootstrap.
+
        * libltdl/ltdl.c: Replace strdup with lt__strdup.
 
 2004-08-30  Gary V. Vaughan  <gary@gnu.org>

diff --git a/bootstrap b/bootstrap
index 804bf792d08607a31dd7dae81ecdbb950dc97fcb..7e51beacc8fe9bc1e3df41c3fa2c57477ebb4546 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -35,14 +35,14 @@ WARNING: If bootstrapping with this script fails, it may be due to an
 WARNING: incompatible installed `libtool.m4' being pulled in to
 WARNING: `aclocal.m4'.  The best way to work around such a problem is to
 WARNING: uninstall your system libtool files, or failing that, overwrite
-WARNING: them with `libtool.m4' as shipped with this distribution.
-WARNING: After that, retry this bootstrap.
+WARNING: them with all m4 file as shipped with this distribution (except
+WARNING: `lt~obsolete.m4').  After that, retry this bootstrap.
 EOF
 
 rm -rf `find . -path './{arch}' -prune -o \( -name autom4te.cache -o -name libtool \) -print`
 
 # Delete stale files from previous libtool versions.
-rm -f acinclude.m4 libltdl/config.h
+rm -f acinclude.m4 config/ltmain.sh libltdl/config.h
 
 if test -z "$reconfdirs"; then
   reconfdirs=". `ls -1d tests/*demo tests/*demo[0-9]`"