* 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...
(func_grep): ...so mere grep is sufficient again...
(EGREP): ...and this is no longer required.

diff --git a/ChangeLog b/ChangeLog
index 363f8afe6b17962f53ebab147758a6cf62ecbaa4..855aafda3ca6c7c5f26b8324497242b73d40180a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-03-30  Gary V. Vaughan  <gary@gnu.org>
 
+       * 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...
+       (func_grep): ...so mere grep is sufficient again...
+       (EGREP): ...and this is no longer required.
+
+2004-03-29  Gary V. Vaughan  <gary@gnu.org>
+
        * m4/libtool.m4: Use LT_INIT as #serial tag.
        * libtoolize.in: Grok LT_INIT!  Pass A[CM]_PROG_LIBTOOL to...
        (func_serial_update): ...here, we now take an additional parameter

diff --git a/libtoolize.in b/libtoolize.in
index 66f3d91dd5ba7e742b9f9b115407a350550a0280..d9adafd56207690576d2ecc7849847590560bfa5 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -49,7 +49,6 @@
 
 : ${CP="cp -f"}
 : ${LN_S="@LN_S@"}
-: ${EGREP="@EGREP@"}
 : ${MKDIR="mkdir"}
 : ${RM="rm -f"}
 : ${SED="@SED@"}
@@ -315,7 +314,7 @@ func_copy_all_files ()
 # Check whether EXPRESSION matches any line of FILENAME, without output.
 func_grep ()
 {
-    $EGREP "$1" "$2" >/dev/null 2>&1
+    grep "$1" "$2" >/dev/null 2>&1
 }
 
 # func_scan_files
@@ -461,7 +460,7 @@ 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(_ONCE)?\(\['"$my_macro_regex" "$my_file"; then
+      if func_grep '^AC_DEFUN\(\['"$my_macro_regex" "$my_file"; then
         my_serial=`$SED -e "$my_sed_serial" "$my_file"`
        break
       fi

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4c8a7d5f0d6a8d4599f867ef156fe20eb09f1deb..ae8821ac4d77f1362b2044790a813a1a06275105 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -43,7 +43,7 @@ m4_define([LT_PREREQ],
 
 # LT_INIT([OPTIONS])
 # --------------------------
-AC_DEFUN_ONCE([LT_INIT],
+AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
 dnl Autoconf doesn't catch unexpanded LT_ macros by default:
 m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
@@ -67,6 +67,9 @@ AC_SUBST(LIBTOOL)dnl
 _LT_SET_OPTIONS([$1])dnl
 
 _LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
 ])# _LT_INIT
 
 # Old names: