From 438422eaf8b3eb6cbc6dfeb89e295809489ae865 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 8 Oct 2003 14:09:02 +0000 Subject: [PATCH] * libtoolize.in: AC_CONFIG_M4_DIR has landed in CVS autoconf. Only it's called AC_CONFIG_MACRO_DIR. Search and replace. Grumble. ;-) --- ChangeLog | 6 ++++++ libtoolize.in | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2b8dea23..ad60d31e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-10-08 Gary V. Vaughan + + * 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 * libltdl/ltdl.c (lt_dlerror): change return value when diff --git a/libtoolize.in b/libtoolize.in index 4ffa90bab..4d6cccf66 100644 --- 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" -- 2.47.2