FYI: 108-gary-libtoolize-BRE-fixes.patch

[Gary V. Vaughan]

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

Applied to HEAD.
- -- 
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 cvsapply version 0.13
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFAaUAEFRMICSmD1gYRAopkAKDBqfEVvURxaNlIHsP0Tavvv8HL7gCgnvT2
FokclorbuLdSibkbNcm5NJ4=
=ua7k
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * libtoolize.in (func_scan_files): sed BRE have no alternation, so
        break LT_INIT matcher out.
        (func_serial): Don't escape literal parens for grep BRE.

Index: libtoolize.in
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.in,v
retrieving revision 1.43
diff -u -p -u -r1.43 libtoolize.in
--- libtoolize.in 30 Mar 2004 08:29:52 -0000 1.43
+++ libtoolize.in 30 Mar 2004 09:38:01 -0000
@@ -357,9 +357,8 @@ func_scan_files ()
        /AC_CONFIG_MACRO_DIR/   {
            s,^.*AC_CONFIG_MACRO_DIR([[         ]*\([^])]*\).*$,m4dir=\1,; p;
         };
-       /\(LT_INIT\|A[CM]_PROG_LIBTOOL\)/ {
-           s,^.*$,seen_libtool=:,; p;
-       };
+       /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
+       /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
        /AC_LIB_LTDL/        { s,^.*$,seen_ltdl=:,; p; };
        d;'
     eval `cat aclocal.m4 "$configure_ac" | $SED "$my_sed_traces" 2>/dev/null`
@@ -460,7 +459,9 @@ func_serial ()
     # in the file that AC_DEFUNs MACRO_REGEX.
     my_serial=
     for my_file in `func_included_files "$my_filename"`; do
-      if func_grep '^AC_DEFUN\(\['"$my_macro_regex" "$my_file"; then
+      if test -z "$my_macro_regex" ||
+         func_grep '^AC_DEFUN(\['"$my_macro_regex" "$my_file"
+      then
         my_serial=`$SED -e "$my_sed_serial" "$my_file"`
        break
       fi