* libtoolize.in (func_scan_files): Don't assume the existence of

aclocal.m4.  Make the comment more descriptive.
Reported by Alexandre Duret-Lutz <adl@src.lip6.fr>

diff --git a/ChangeLog b/ChangeLog
index 94cd3054f0c2c91c27034656fb134caa25123dc8..7f5fd5b3ae0d65ce8af5b10b93e38343b53aafb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-01-06  Gary V. Vaughan  <gary@gnu.org>
 
+       * libtoolize.in (func_scan_files): Don't assume the existence of
+       aclocal.m4.  Make the comment more descriptive.
+       Reported by Alexandre Duret-Lutz <adl@src.lip6.fr>
+
        * NEWS: Note libtoolize changes.
 
        * ChangeLog.2003: New file, containing all the ChangeLog entries

diff --git a/libtoolize.in b/libtoolize.in
index dd5c384282f99c1dc6740327a2652f9a2dddd593..92de17de2786eb6610987d4c282ca2aa96af4279 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -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`
 
 
     # ---------------- #