From 7ae2b77a894503976424d42d58800e82d28f5896 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 3 Sep 2004 08:10:21 +0000 Subject: [PATCH] * 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. --- ChangeLog | 4 ++++ bootstrap | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b46b14648..906f3761d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-09-03 Gary V. Vaughan + * 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 * 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 7e51beacc..e163ea83e 100755 --- 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 -- 2.47.2