From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 1 Sep 2005 11:13:23 +0000 (+0000)
Subject: * libtoolize.m4sh (func_scan_files): When searching for evidence
X-Git-Tag: release-2-1b~539
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07821db0fd8f73700e80bc2de66d613023cadbb1;p=thirdparty%2Flibtool.git

* libtoolize.m4sh (func_scan_files): When searching for evidence
of Autotools in aclocal.m4, be careful not to trip over requires
and defuns.
---

diff --git a/ChangeLog b/ChangeLog
index 58433dd3b..b9666f29b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-01  Gary V. Vaughan  <gary@gnu.org>
+
+	* libtoolize.m4sh (func_scan_files): When searching for evidence
+	of Autotools in aclocal.m4, be careful not to trip over requires
+	and defuns.
+
 2005-08-31  Gary V. Vaughan <gary@gnu.org>,
 	    Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 811b1dd8a..720955bc0 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -362,10 +362,12 @@ func_scan_files ()
     # ---------------------------------------------------- #
 
     my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
-    	/AC_CONFIG_AUX_DIR[[^_]]/  {
+        s,^.*AC_REQUIRE(.*$,,; s,^.*m4[]_require(.*$,,; s,^.*m4[]_define(.*$,,;
+	s,^.*A[[CU]]_DEFUN(.*$,,; s,^.*m4[]_defun(.*$,,;
+    	/AC_CONFIG_AUX_DIR(/ {
 	    s,^.*AC_CONFIG_AUX_DIR([[[ 	]*\([^])]]*\).*$,auxdir=\1,; p;
         };
-    	/AC_CONFIG_MACRO_DIR/   {
+    	/AC_CONFIG_MACRO_DIR(/ {
 	    s,^.*AC_CONFIG_MACRO_DIR([[[ 	]*\([^])]]*\).*$,m4dir=\1,; p;
         };
 	/A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
@@ -374,7 +376,7 @@ func_scan_files ()
 	/LT_WITH_LTDL/       { s,^.*$,seen_ltdl=:,; p; };
 	/AC_LIB_LTDL/        { s,^.*$,seen_ltdl=:,; p; };
 	/AC_WITH_LTDL/       { s,^.*$,seen_ltdl=:,; p; };
-	d;'
+	d'
     eval `cat aclocal.m4 "$configure_ac" 2>/dev/null | $SED "$my_sed_traces"`