From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 6 Jan 2004 20:25:53 +0000 (+0000)
Subject: * libtoolize.in (func_scan_files): Don't assume the existence of
X-Git-Tag: release-1-9b~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96bf572fa917fec776057c648b89ee8304ea966c;p=thirdparty%2Flibtool.git

* 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 94cd3054f..7f5fd5b3a 100644
--- 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 dd5c38428..92de17de2 100644
--- 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`
 
 
     # ---------------- #