[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [1.5.1 PATCHES] Things I would like to merge from HEAD to branch-1-5
Gary V . Vaughan
Re: [1.5.1 PATCHES] Things I would like to merge from HEAD to branch-1-5 for a libtool 1.5.1 release
Thu, 22 Jan 2004 09:45:44 +0000
-----BEGIN PGP SIGNED MESSAGE-----
Thanks for cataloguing these patches.
Yup, everything looks good. Okay to commit all except this one:
On Wednesday, January 21, 2004, at 10:28 pm, Scott James Remnant wrote:
2004-01-?? Scott James Remnant <address@hidden>
* libtool.m4 (AC_LIBTOOL_CONFIG): Don't attempt to
make ltmain.sh unless there's an ltmain.in to do it with.
diff -rup libtool-1.5/libtool.m4 libtool-1.5.1/libtool.m4
--- libtool-1.5/libtool.m4 2004-01-21 20:51:23.000000000 +0000
+++ libtool-1.5.1/libtool.m4 2004-01-09 14:55:35.000000000 +0000
@@ -4332,7 +4305,10 @@ else
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- test -f Makefile && make "$ltmain"
+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+ if test -f "$ltmain_in"; then
+ test -f Makefile && make "$ltmain"
How is this better than what we already have? Without the patch we run
make (which I suppose might have a rule to fetch ltmain.in, but that is
a bootstrap issue, and we don't have such a rule in our Makefile) and
the generated libtool won't be complete. With it, we don't even run
make and libtool is still doomed! The whole block is executed in the
else branch of "if test -f $ltmain", so if the extra code skips running
make then both ltmain.sh and ltmain.in are absent. Bleh!
If ltmain.in is missing, then we're screwed anyhow. If something needs
to be done, we should AC_MSG_ERROR I guess, but I thought the Makefile
would bail with an unsatisfied dependency. The rest of the configure
is broken once missing ltmain.in is established. The sooner we can
diagnose that for the user, the better.
We should definitely make this diagnosis in HEAD though, because there
Make is no longer involved in the bootstrap, and missing both ltmain.in
and ltmain.sh at configure time is fatal, bootstrap or no.
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://www.oranda.demon.co.uk
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)
-----END PGP SIGNATURE-----