diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2004-03-30 09:38:29 +0000 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2004-03-30 09:38:29 +0000 |
| commit | b2d58a67de0b7a9453afdbb3edd7a0c18cf1f951 (patch) | |
| tree | 5478368ba94dc3d5b9340b2bac8b918c2c8f8631 /libtoolize.in | |
| parent | aa86d1daccf636243c551751cac2ca7b43823915 (diff) | |
| download | libtool-b2d58a67de0b7a9453afdbb3edd7a0c18cf1f951.tar.gz | |
* 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.
Diffstat (limited to 'libtoolize.in')
| -rw-r--r-- | libtoolize.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libtoolize.in b/libtoolize.in index d9adafd5..bf1ddc09 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 |