* libtoolize.in: AC_CONFIG_M4_DIR has landed in CVS autoconf.

Only it's called AC_CONFIG_MACRO_DIR.  Search and replace.
Grumble. ;-)

diff --git a/ChangeLog b/ChangeLog
index a2b8dea2359bdbdf3ae662889e47bacdbec95d3b..ad60d31e5cf56f81e30f2f7378167f1fab252fe3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-08  Gary V. Vaughan  <gary@gnu.org>
+
+       * libtoolize.in: AC_CONFIG_M4_DIR has landed in CVS autoconf.
+       Only it's called AC_CONFIG_MACRO_DIR.  Search and replace.
+       Grumble. ;-)
+
 2003-10-08  Scott James Remnant  <scott@netsplit.com>
 
        * libltdl/ltdl.c (lt_dlerror): change return value when

diff --git a/libtoolize.in b/libtoolize.in
index 4ffa90babc0c258427f7c5d5ea702a37a4f2bb1a..4d6cccf669380f4c2edb4ab5db2aea2418180bf0 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -299,8 +299,8 @@ func_scan_files ()
        /AC_CONFIG_AUX_DIR/  {
            s,^.*AC_CONFIG_AUX_DIR([[   ]*\([^])]*\).*$,auxdir=\1,; p;
         };
-       /AC_CONFIG_M4_DIR/   {
-            s,^.*AC_CONFIG_M4_DIR([[   ]*\([^])]*\).*$,m4dir=\1,; p;
+       /AC_CONFIG_MACRO_DIR/   {
+            s,^.*AC_CONFIG_MACRO_DIR([[        ]*\([^])]*\).*$,m4dir=\1,; p;
         };
        /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
        /AC_LIB_LTDL/        { s,^.*$,seen_ltdl=:,; p; };
@@ -340,7 +340,7 @@ func_scan_files ()
     # Find local m4 macro directory. #
     # ------------------------------ #
 
-    # If AC_CONFIG_M4_DIR turned nothing up, we hunt for ACLOCAL_AMFLAGS
+    # If AC_CONFIG_MACRO_DIR turned nothing up, we hunt for ACLOCAL_AMFLAGS
     # in `Makefile.am' for a `-I' argument.
 
     my_sed_aclocal_flags='/^[  ]*ACLOCAL_[A-Z_]*FLAGS[         ]*=/ {
@@ -579,7 +579,7 @@ func_config_update ()
 
   # Copy libtool's m4 macros to the macro directory, if they are newer.
   $quiet_opt || if test "$m4dir" != .; then
-    func_echo "putting macros in AC_CONFIG_M4_DIR, \`$m4dir'."
+    func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
   fi
   func_serial_update 'A[CM]_PROG_LIBTOOL' "$aclocaldir/libtool.m4" "$m4dir/libtool.m4"