* 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 58433dd3b8eaa7cc3742c8cf9c2a0888411f3e5a..b9666f29b1a1129c9b4db46b61740b97ad0418ce 100644 (file)
--- 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 811b1dd8ae388f3feecf9a338c6f980f1f7858bb..720955bc0e0f5528b1463f9fd84d1d8a216e7e07 100644 (file)
--- 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"`