* 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.

diff --git a/ChangeLog b/ChangeLog
index 855aafda3ca6c7c5f26b8324497242b73d40180a..62dd5f301d12594943d891ff9c9e0db827ec510a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-30  Gary V. Vaughan  <gary@gnu.org>
 
+       * 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.
+
        * m4/libtool.m4 (LT_INIT): aclocal can't see AC_DEFUN_ONCE, so use
        AC_DEFUN and m4_define.
        * libtoolize.in (func_serial): No longer accept AC_DEFUN_ONCE...

diff --git a/libtoolize.in b/libtoolize.in
index d9adafd56207690576d2ecc7849847590560bfa5..bf1ddc09b37c48084371a9d5119a6b6b8adb4781 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -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