fix libtoolize scan of non-m4_include style aclocal.m4 [libtool--gary--1.0--patch-38]

[Gary V. Vaughan]

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

Okay to commit?

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

- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFDFbP1FRMICSmD1gYRAg+MAJ4yKDwyUqcGpd0lrosgSU2CpfchBQCdGy7o
NUx0ai2Mvp5sSe8aX7WON0I=
=+9DH
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--gary--1.0--patch-37 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-37
M  libtoolize.m4sh
M  ChangeLog

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

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

--- orig/libtoolize.m4sh
+++ mod/libtoolize.m4sh
@@ -363,10 +363,12 @@
     # ---------------------------------------------------- #
 
     my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
-       /AC_CONFIG_AUX_DIR[[^_]]/  {
+        s,^.*AC_REQUIRE(.*$,,; s,^.*m4_require(.*$,,;
+       s,^.*A[[CU]]_DEFUN(.*$,,; s,^.*m4_defun(.*$,; s,^.*m4_define(.*$,;
+       /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; };