* bootstrap: Remember that the ltmain.sh generated by bootstrap

is missing most of its substitution values, so force it to be
rebuilt at make time by touching $(top_srcdir)/config/ltmain.in.

diff --git a/ChangeLog b/ChangeLog
index b46b14648e97e371530fa52c17d4e3d04e40c223..906f3761d1d0f5ea5484542ba539c01a287ef7d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-03  Gary V. Vaughan  <gary@gnu.org>
 
+       * bootstrap: Remember that the ltmain.sh generated by bootstrap
+       is missing most of its substitution values, so force it to be
+       rebuilt at make time by touching $(top_srcdir)/config/ltmain.in.
+
        From Martin Quinson <mquinson@ens-lyon.fr>
        * m4/libtool.m4 (_LT_SETUP, _LT_ENABLE_LOCK, LT_PATH_LD): Use
        AS_HELP_STRING to get rid of autoconf -Wobsolete warning

diff --git a/bootstrap b/bootstrap
index 7e51beacc8fe9bc1e3df41c3fa2c57477ebb4546..e163ea83ec076e4cf03db10ec761303146ea4e03 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -52,7 +52,10 @@ fi
 set -- `sed '/AC_INIT/{s/[][,()]/ /g; p;};d' configure.ac`
 
 # Building distributed files from configure is bad for automake, so we
-# generate them here, and have Makefile rules to keep them up to date:
+# generate them here, and have Makefile rules to keep them up to date.
+# We don't have all the substitution values to build ltmain.sh from this
+# script yet, but we need config/ltmain.sh for the libtool commands in
+# configure, and ltversion.m4 to generate configure in the first place:
 rm -f ./config/ltmain.sh ./m4/ltversion.m4
 test -f Makefile || { makefile=Makefile; cp Makefile.am $makefile; }
 make ./config/ltmain.sh ./m4/ltversion.m4 \
@@ -83,4 +86,9 @@ rm -f ./config/libtoolize
 # These files can cause an infinite configure loop if left behind.
 rm -f Makefile libltdl/Makefile libtool vcl.tmp
 
+# This file is misgenerated earlier in bootstrap to satisfy automake 1.9.1
+# and earlier, but has a new enough timestamp to not be updated.  Force it
+# to be regenerated at make-time with proper substitutions in place:
+touch config/ltmain.in
+
 exit 0