From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 30 Mar 2004 09:38:29 +0000 (+0000)
Subject: * libtoolize.in (func_scan_files): sed BRE have no alternation, so
X-Git-Tag: release-1-9b~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2d58a67de0b7a9453afdbb3edd7a0c18cf1f951;p=thirdparty%2Flibtool.git

* 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 855aafda3..62dd5f301 100644
--- 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 d9adafd56..bf1ddc09b 100644
--- 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