FYI: 65-gary-fix-aclocal-m4-assumption.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.  Thanks for the report.

Cheers,
        Gary.
- -------- Original Message --------
Subject: Re: FYI: adjust automake test suite for CVS libtoolize
Date: Mon, 05 Jan 2004 01:08:34 +0100
From: Alexandre Duret-Lutz <address@hidden>
To: Gary V.Vaughan <address@hidden>
CC: address@hidden
References: <address@hidden>

Another new behavior is that libtoolize complains when
aclocal.m4 does not exist.

~/projs/cvs/automake/HEAD3/tests % ./libtool5.test
[...]
=== Running test ./libtool5.test
++ pwd
/home/adl/projs/cvs/automake/HEAD3/tests/testSubDir
+ set -e
+ cat
+ cat
+ libtoolize
cat: aclocal.m4: No such file or directory
libtoolize: copying file `./ltmain.sh'
libtoolize: copying file `./libtool.m4'
[...]

This one looks rather like a bug.

- --
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 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQE/+xpbFRMICSmD1gYRAt4kAJ4tv87v5KtXAroDJQg+WKxabQJi1QCfQRIT
UF30xwBBJxnUAGQbT6J2cK8=
=1UIK
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * libtoolize.in (func_scan_files): Don't assume the existence of
        aclocal.m4.  Make the comment more descriptive.
        Reported by Alexandre Duret-Lutz <address@hidden>

Index: libtoolize.in
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.in,v
retrieving revision 1.31
diff -u -p -u -r1.31 libtoolize.in
--- libtoolize.in 4 Jan 2004 20:45:24 -0000 1.31
+++ libtoolize.in 6 Jan 2004 20:12:06 -0000
@@ -267,8 +267,11 @@ func_grep ()
 }
 
 # func_scan_files
-# Trace configure.(ac|in) for use of autoconf, gettext, aclocal, automake,
-# libltdl and libtool.  Possibly running some of these tools if necessary.
+# Scan configure.(ac|in) and aclocal.m4 (if present) for use of libltdl
+# and libtool.  Possibly running some of these tools if necessary.
+# Libtoolize affects the contents of aclocal.m4, and should be run before
+# aclocal, so we can't use configure --trace which relies on a consistent
+# configure.(ac|in) and aclocal.m4.
 func_scan_files ()
 {
     # Prefer configure.ac to configure.in
@@ -306,7 +309,7 @@ func_scan_files ()
        /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
        /AC_LIB_LTDL/        { s,^.*$,seen_ltdl=:,; p; };
        d;'
-    eval `cat aclocal.m4 "$configure_ac" | sed "$my_sed_traces"`
+    eval `cat aclocal.m4 "$configure_ac" | sed "$my_sed_traces" 2>/dev/null`
 
 
     # ---------------- #