libtoolize: migrate to new AC_CONFIG_MACRO_DIRS api.

* libtoolize.in (func_install_pkgmacro_files): Uee AC_CONFIG_MACRO_DIRS. (func_check_macros): Advise using AC_CONFIG_MACRO_DIRS. (require_ac_macro_dir): Give priority to AC_CONFIG_MACRO_DIRS. (require_macro_dir): Likewise. * bootstrap: Give priority to AC_CONFIG_MACRO_DIRS. * configure.ac: Define dummy AC_CONFIG_MACRO_DIRS for older Autotools, that is allow bootstrap with current release versions. Use AC_CONFIG_MACRO_DIRS instead of AC_CONFIG_MACRO_DIR. * tests/testsuite.at: Source build-aux/extract-trace for access to func_extract_trace. (LT_AT_ACLOCAL): Use it to get the AC_CONFIG_MACRO_DIRS argument to pass manually to aclocal for compatibility with old Automake. Add a fallback AC_CONFIG_MACRO_DIRS definition to acinclude.m4 in the test directory. (LT_AT_AUTORECONF): Likewise. * tests/cdemo.at, tests/configure-iface.at, tests/darwin.at, tests/demo.at, tests/depdemo.at, tests/early-libtool.at, tests/libtoolize.at, tests/mdemo.at, tests/no-executables.at, tests/nonrecursive.at, tests/old-ltdl-iface.at, tests/recursive.at, tests/subproject.at, tests/tagdemo.at, tests/template.at: Likewise. * doc/libtool.texi: Update. * NEWS: Update. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2025-02-05 14:40:42 +08:00 · 2012-10-18 20:37:03 +07:00 · 2012-10-18 20:37:03 +07:00 · 4d644c39d8
commit 4d644c39d8
parent 0dd94ed521
21 changed files with 129 additions and 84 deletions
--- a/11
+++ b/11
@ -79,6 +79,17 @@ NEWS - list of user-visible changes between releases of GNU Libtool
    releases took the first ACLOCAL_AMFLAGS argument, but the last
    invocation of AC_CONFIG_MACRO_DIRS.

+  - The libtoolize program now advises use of the new Autoconf
+    AC_CONFIG_MACRO_DIRS declaration.  If you follow that advice, all
+    your developers will need at least autoconf-2.70 and automake-1.13
+    to rebootstrap your probject.  If you still need to support
+    bootstrap with older Autotools, then you should add the following
+    to your configure.ac file:
+
+        m4_ifndef([AC_CONFIG_MACRO_DIRS],
+            [m4_define([AC_CONFIG_MACRO_DIRS],
+                m4_defn([AC_CONFIG_MACRO_DIR]))])
+
 New in 2.4.2 2011-10-17: git version 2.4.1a, Libtool team:

 * New features:
--- a/6
+++ b/6
@ -1483,6 +1483,10 @@ func_require_macro_dir ()
    $debug_cmd

    # Sometimes this is stored in `configure.ac'.
+    test -n "$macro_dir" || {
+      func_extract_trace_first AC_CONFIG_MACRO_DIRS
+      macro_dir=$func_extract_trace_first_result
+    }
    test -n "$macro_dir" || {
      func_extract_trace_first AC_CONFIG_MACRO_DIR
      macro_dir=$func_extract_trace_first_result
@ -1506,7 +1510,7 @@ func_require_macro_dir ()
    func_verbose "macro_dir='$macro_dir'"

    func_check_configuration macro_dir \
-        "AC_CONFIG_MACRO_DIR([name of a directory for configure m4 files])"
+        "AC_CONFIG_MACRO_DIRS([name of a directory for configure m4 files])"

    $require_vc_ignore_files

--- a/configure.ac
+++ b/configure.ac
@ -37,6 +37,11 @@ AC_INIT([GNU Libtool],
 m4_ifndef([AC_PACKAGE_URL],
 	  [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/s/libtool/])])

+# Remove this when a released Autoconf is capable of bootstrapping
+# Libtool without it (probably after autoconf-2.70).
+m4_ifndef([AC_CONFIG_MACRO_DIRS],
+	  [m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
+
 # Since we already declare these directories in this file, save those
 # choices, and push the results into Makefile.am to avoid declaring
 # them in two places making renames error prone, and where copies
@ -45,14 +50,14 @@ m4_define([AC_CONFIG_AUX_DIR],
     m4_defn([AC_CONFIG_AUX_DIR])[AC_SUBST([aux_dir], [$1])])
 m4_define([LT_CONFIG_LTDL_DIR],
     m4_defn([LT_CONFIG_LTDL_DIR])[AC_SUBST([ltdl_dir], [$1])])
-m4_define([AC_CONFIG_MACRO_DIR],
-     m4_defn([AC_CONFIG_MACRO_DIR])[AC_SUBST([macro_dir], [$1])])
+m4_define([AC_CONFIG_MACRO_DIRS],
+     m4_defn([AC_CONFIG_MACRO_DIRS])[AC_SUBST([macro_dir], [$1])])

 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AC_CONFIG_LIBOBJ_DIR([libltdl])

 package_revision=`$SHELL $ac_aux_dir/git-version-gen .tarball-version`
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@ -2440,9 +2440,9 @@ Because of these changes, and the runtime version compatibility checks
 Libtool now executes, we now advise @strong{against} including a copy of
@file{libtool.m4} (and brethren) in @file{acinclude.m4}.  Instead,
 you should set your project macro directory with
-@code{AC_CONFIG_MACRO_DIR}.  When you @command{libtoolize} your
+@code{AC_CONFIG_MACRO_DIRS}.  When you @command{libtoolize} your
 project, a copy of the relevant macro definitions will be placed in
-your @code{AC_CONFIG_MACRO_DIR}, where @command{aclocal} can reference
+your @code{AC_CONFIG_MACRO_DIRS}, where @command{aclocal} can reference
 them directly from @file{aclocal.m4}.


@ -2649,20 +2649,20 @@ messages).
 trick$ @kbd{LIBTOOLIZE_OPTIONS=--no-warn,--quiet autoreconf --install}
@end example

-@findex AC_CONFIG_MACRO_DIR
+@findex AC_CONFIG_MACRO_DIRS
 If @command{libtoolize} detects an explicit call to
-@code{AC_CONFIG_MACRO_DIR} (@pxref{Input, , The Autoconf Manual,
+@code{AC_CONFIG_MACRO_DIRS} (@pxref{Input, , The Autoconf Manual,
 autoconf, The Autoconf Manual}) in your @file{configure.ac}, it will
 put the Libtool macros in the specified directory.

 In the future other Autotools will automatically check the contents of
-@code{AC_CONFIG_MACRO_DIR}, but at the moment it is more portable to
+@code{AC_CONFIG_MACRO_DIRS}, but at the moment it is more portable to
 add the macro directory to @code{ACLOCAL_AMFLAGS} in
@file{Makefile.am}, which is where the tools currently look.  If
-@command{libtoolize} doesn't see @code{AC_CONFIG_MACRO_DIR}, it too
+@command{libtoolize} doesn't see @code{AC_CONFIG_MACRO_DIRS}, it too
 will honour the first @samp{-I} argument in @code{ACLOCAL_AMFLAGS}
 when choosing a directory to store libtool configuration macros in.
-It is perfectly sensible to use both @code{AC_CONFIG_MACRO_DIR} and
+It is perfectly sensible to use both @code{AC_CONFIG_MACRO_DIRS} and
@code{ACLOCAL_AMFLAGS}, as long as they are kept in synchronisation.

@example
--- a/libtoolize.in
+++ b/libtoolize.in
@ -855,7 +855,7 @@ func_install_pkgmacro_files ()

    # Install the libltdl autoconf macros to this project's source tree.
    $opt_quiet || if test -n "$ac_macro_dir"; then
-      my_pkgmacro_header="putting macros in AC_CONFIG_MACRO_DIR, \`$ac_macro_dir'."
+      my_pkgmacro_header="putting macros in AC_CONFIG_MACRO_DIRS, \`$ac_macro_dir'."
    else
      my_pkgmacro_header="putting macros in \`$macro_dir'."
    fi
@ -1169,12 +1169,12 @@ func_check_macros ()

    # Suggest modern idioms for storing autoconf macros:
    $ac_config_macro_dir_advised || if test -z "$macro_dir" || test . = "$macro_dir"; then
-      func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and"
+      func_echo "Consider adding \`AC_CONFIG_MACRO_DIRS([m4])' to $configure_ac and"
      func_echo "rerunning $progname, to keep the correct libtool macros in-tree."
      ac_config_macro_dir_advised=:

    elif test -z "$ac_macro_dir"; then
-      func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([$macro_dir])' to $configure_ac,"
+      func_echo "Consider adding \`AC_CONFIG_MACRO_DIRS([$macro_dir])' to $configure_ac,"
      func_echo "and rerunning $progname and aclocal."
      ac_config_macro_dir_advised=:
    fi
@ -1515,7 +1515,7 @@ cannot expand unknown variable in LTDL_INIT argument."

 # require_ac_macro_dir
 # --------------------
-# Extract ac_macro_dir from AC_CONFIG_MACRO_DIR.
+# Extract ac_macro_dir from AC_CONFIG_MACRO_DIRS.
 require_ac_macro_dir=func_require_ac_macro_dir
 func_require_ac_macro_dir ()
 {
@ -1524,8 +1524,13 @@ func_require_ac_macro_dir ()
    $require_configure_ac

    if test -n "$configure_ac"; then
-      func_extract_trace_first AC_CONFIG_MACRO_DIR
+      func_extract_trace_first AC_CONFIG_MACRO_DIRS
      ac_macro_dir=$func_extract_trace_first_result
+
+      test -n "$ac_macro_dir" || {
+        func_extract_trace_first AC_CONFIG_MACRO_DIR
+	ac_macro_dir=$func_extract_trace_first_result
+      }
    fi

    require_ac_macro_dir=:
@ -1797,7 +1802,7 @@ func_require_ltdl_mode ()
 # require_macro_dir
 # -----------------
 # If both are specified, ensure both ACLOCAL_AMFLAGS and
-# AC_CONFIG_MACRO_DIR agree, and set macro_dir to the value of either.
+# AC_CONFIG_MACRO_DIRS agree, and set macro_dir to the value of either.
 require_macro_dir=func_require_macro_dir
 func_require_macro_dir ()
 {
@ -1806,7 +1811,7 @@ func_require_macro_dir ()
    $require_ac_macro_dir
    $require_am_macro_dir

-    # AC_CONFIG_MACRO_DIR takes precedence.
+    # AC_CONFIG_MACRO_DIRS takes precedence.
    macro_dir=$ac_macro_dir

    # Followed by first -I optarg from ACLOCAL_AMFLAGS.
@ -1827,7 +1832,7 @@ func_require_macro_dir ()
    # Diagnose conflicts.
    if test -n "$ac_macro_dir" && test -n "$am_macro_dir"; then
      test "$ac_macro_dir" = "$am_macro_dir" || func_fatal_error "\
-AC_CONFIG_MACRO_DIR([$ac_macro_dir]) conflicts with ACLOCAL_AMFLAGS=-I $am_macro_dir."
+AC_CONFIG_MACRO_DIRS([$ac_macro_dir]) conflicts with ACLOCAL_AMFLAGS=-I $am_macro_dir."
    fi

    require_macro_dir=:
--- a/tests/cdemo.at
+++ b/tests/cdemo.at
@ -32,7 +32,7 @@ m4_define([_LT_SETUP],
 [AT_DATA([configure.ac],
 [[AC_INIT([cdemo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
 LT_INIT
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@ -107,7 +107,7 @@ _LT_AT_LTDL_SETUP
 AT_DATA([configure.ac],
 [[AC_INIT([installable-ltdl-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([libltdl/config])
-AC_CONFIG_MACRO_DIR([libltdl/m4])
+AC_CONFIG_MACRO_DIRS([libltdl/m4])
 AC_CONFIG_HEADERS([config.h:config.hin])
 LT_CONFIG_LTDL_DIR([libltdl])
 AM_INIT_AUTOMAKE([foreign])
@ -182,7 +182,7 @@ _LT_AT_LTDL_SETUP

 AT_DATA([configure.ac],
 [[AC_INIT([configure-iface-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
-AC_CONFIG_MACRO_DIR([_inst/aclocal])
+AC_CONFIG_MACRO_DIRS([_inst/aclocal])
 AC_CONFIG_HEADERS([config.h:config.hin])
 AM_INIT_AUTOMAKE([foreign])
 AC_PROG_CC
@ -248,7 +248,7 @@ _LT_AT_LTDL_SETUP
 AT_DATA([configure.ac],
 [[AC_INIT([configure-iface-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([libltdl/config])
-AC_CONFIG_MACRO_DIR([libltdl/m4])
+AC_CONFIG_MACRO_DIRS([libltdl/m4])
 AC_CONFIG_HEADERS([config.h:config.hin])
 LT_CONFIG_LTDL_DIR([libltdl])
 AM_INIT_AUTOMAKE([foreign])
--- a/tests/darwin.at
+++ b/tests/darwin.at
@ -209,7 +209,7 @@ AT_SETUP([darwin ld warnings changing configure results])

 AT_DATA([configure.ac],
 [[AC_INIT([ld-stderr], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE([foreign])
 AC_PROG_CC
 LT_INIT
--- a/tests/demo.at
+++ b/tests/demo.at
@ -59,7 +59,7 @@ m4_define([_LT_DEMO_SETUP],
 [AT_DATA([configure.ac],
 [[AC_INIT([demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE
 AC_PROG_CC

--- a/tests/depdemo.at
+++ b/tests/depdemo.at
@ -60,7 +60,7 @@ m4_define([_LT_SETUP],
 [AT_DATA([configure.ac],
 [[AC_INIT([depdemo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE
 AC_PROG_CC

--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@ -33,7 +33,7 @@ AT_SETUP([config.status])

 AT_DATA([configure.ac],
 [[AC_INIT([libtool-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@ -127,7 +127,7 @@ AT_SETUP([config.lt])

 AT_DATA([configure.ac],
 [[AC_INIT([libtool-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 LT_OUTPUT

--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@ -32,7 +32,7 @@ m4_define([_LT_CONFIGURE_AC],
 [AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 AC_OUTPUT
 ]])
@ -88,7 +88,7 @@ _LT_CONFIGURE_AC
 AT_DATA(expout,
 [[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
@ -115,7 +115,7 @@ AT_DATA([Makefile.am],
 ]])

 AT_DATA(experr,
-[[libtoolize: error: AC_CONFIG_MACRO_DIR([m4]) conflicts with ACLOCAL_AMFLAGS=-I me2.
+[[libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I me2.
 ]])

 LT_AT_CHECK_LIBTOOLIZE([--copy], 1, [ignore], experr)
@ -123,17 +123,17 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 1, [ignore], experr)
 AT_CLEANUP


-## ---------------------------------------- ##
-## AC_CONFIG_MACRO_DIR macrodir extraction. ##
-## ---------------------------------------- ##
+## ----------------------------------------- ##
+## AC_CONFIG_MACRO_DIRS macrodir extraction. ##
+## ----------------------------------------- ##

-AT_SETUP([multiple AC_CONFIG_MACRO_DIR invocation])
+AT_SETUP([multiple AC_CONFIG_MACRO_DIRS invocation])

 AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([first])
-AC_CONFIG_MACRO_DIR([second])
+AC_CONFIG_MACRO_DIRS([first])
+AC_CONFIG_MACRO_DIRS([second])
 LT_INIT
 AC_OUTPUT
 ]])
@ -141,7 +141,7 @@ AC_OUTPUT
 AT_DATA(expout,
 [[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `first'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `first'.
 libtoolize: copying file `first/libtool.m4'
 libtoolize: copying file `first/ltoptions.m4'
 libtoolize: copying file `first/ltsugar.m4'
@ -181,7 +181,7 @@ libtoolize: copying file `first/ltoptions.m4'
 libtoolize: copying file `first/ltsugar.m4'
 libtoolize: copying file `first/ltversion.m4'
 libtoolize: copying file `first/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([first])' to configure.ac,
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIRS([first])' to configure.ac,
 libtoolize: and rerunning libtoolize and aclocal.
 ]])

@ -205,7 +205,7 @@ _LT_LIBTOOLIZE_SETUP
 ## -------------------------------------------------------------------- ##

 AT_DATA(expout,
-[[libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+[[libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
@ -241,7 +241,7 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr)
 AT_DATA(expout,
 [[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
@ -282,7 +282,7 @@ AT_DATA(expout,
 libtoolize: copying file `build-aux/config.guess'
 libtoolize: copying file `build-aux/config.sub'
 libtoolize: copying file `build-aux/install-sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
@ -321,7 +321,7 @@ libtoolize: copying file `build-aux/config.guess'
 libtoolize: copying file `build-aux/config.sub'
 libtoolize: copying file `build-aux/install-sh'
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
@ -355,7 +355,7 @@ libtoolize: copying file `build-aux/config.guess'
 libtoolize: copying file `build-aux/config.sub'
 libtoolize: copying file `build-aux/install-sh'
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltdl.m4'
@ -400,7 +400,7 @@ libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 LTDL_INIT([nonrecursive])
 AC_OUTPUT
@ -428,7 +428,7 @@ libtoolize: linking file `build-aux/depcomp'
 libtoolize: linking file `build-aux/install-sh'
 libtoolize: linking file `build-aux/missing'
 libtoolize: linking file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: linking file `m4/argz.m4'
 libtoolize: linking file `m4/libtool.m4'
 libtoolize: linking file `m4/ltdl.m4'
@ -477,7 +477,7 @@ AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 LTDL_INIT
 AC_OUTPUT
@ -527,7 +527,7 @@ libtoolize: copying file `build-aux/depcomp'
 libtoolize: copying file `build-aux/install-sh'
 libtoolize: copying file `build-aux/missing'
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltdl.m4'
@ -578,7 +578,7 @@ AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 AC_OUTPUT
 ]])
@ -611,7 +611,7 @@ libtoolize:   `/usr/local/share/aclocal/ltoptions.m4'
 libtoolize:   `/usr/local/share/aclocal/ltsugar.m4'
 libtoolize:   `/usr/local/share/aclocal/ltversion.m4'
 libtoolize:   `/usr/local/share/aclocal/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac,
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
 libtoolize: and rerunning libtoolize and aclocal.
 libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 ]])
@ -626,7 +626,7 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
 AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 AC_OUTPUT
 ]])
@ -649,7 +649,7 @@ AC_DEFUN([LT_INIT],
 ]])

 AT_DATA([expout],
-[[libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+[[libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
@ -683,7 +683,7 @@ AT_DATA([m4/ltoptions.m4], [[
 ]])

 AT_DATA([expout],
-[[libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+[[libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 ]])

@ -700,7 +700,7 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr)
 AT_DATA(expout,
 [[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
@ -713,11 +713,11 @@ LT_AT_CHECK_LIBTOOLIZE([--copy --force], 0, expout)
 AT_CLEANUP


-## ------------------------------------------------------------------ ##
-## Ensure libtoolize works when AC_CONFIG_MACRO_DIR is not specified. ##
-## ------------------------------------------------------------------ ##
+## ------------------------------------------------------------------- ##
+## Ensure libtoolize works when AC_CONFIG_MACRO_DIRS is not specified. ##
+## ------------------------------------------------------------------- ##

-AT_SETUP([verbatim aclocal.m4 w/o AC_CONFIG_MACRO_DIR])
+AT_SETUP([verbatim aclocal.m4 w/o AC_CONFIG_MACRO_DIRS])

 AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
@ -746,7 +746,7 @@ libtoolize:   `/usr/local/share/aclocal/libtool.m4'
 libtoolize:   `/usr/local/share/aclocal/ltsugar.m4'
 libtoolize:   `/usr/local/share/aclocal/ltversion.m4'
 libtoolize:   `/usr/local/share/aclocal/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac,
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
 libtoolize: and rerunning libtoolize and aclocal.
 libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 ]])
@ -754,9 +754,9 @@ libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)


-## ----------------------------------------------------------------------- ##
-## Upgrading an aclocal maintained aclocal.m4 without AC_CONFIG_MACRO_DIR. ##
-## ----------------------------------------------------------------------- ##
+## ------------------------------------------------------------------------ ##
+## Upgrading an aclocal maintained aclocal.m4 without AC_CONFIG_MACRO_DIRS. ##
+## ------------------------------------------------------------------------ ##

 LT_AT_ACLOCAL([-I $abs_top_srcdir/m4])

@ -820,7 +820,7 @@ $SED -e 's|^#.*serial.*ltoptions.m4$|# serial 99999 ltoptions.m4|' \
 mv -f aclocal.m4t aclocal.m4

 AT_DATA([expout],
-[[libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac,
+[[libtoolize: Consider adding `AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
 libtoolize: and rerunning libtoolize and aclocal.
 libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 ]])
@ -835,7 +835,7 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
 AT_DATA(expout,
 [[libtoolize: putting auxiliary files in `.'.
 libtoolize: copying file `./ltmain.sh'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac,
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
 libtoolize: and rerunning libtoolize and aclocal.
 libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 ]])
@ -845,11 +845,11 @@ LT_AT_CHECK_LIBTOOLIZE([--copy --force], 0, expout)
 AT_CLEANUP


-## ------------------------------------------------------------- ##
-## Check nonrecursive ltdl puts m4 files in AC_CONFIG_MACRO_DIR. ##
-## ------------------------------------------------------------- ##
+## -------------------------------------------------------------- ##
+## Check nonrecursive ltdl puts m4 files in AC_CONFIG_MACRO_DIRS. ##
+## -------------------------------------------------------------- ##

-AT_SETUP([nonrecursive ltdl with AC_CONFIG_MACRO_DIR])
+AT_SETUP([nonrecursive ltdl with AC_CONFIG_MACRO_DIRS])

 AT_DATA(expout,
 [[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
@ -857,7 +857,7 @@ libtoolize: copying file `build-aux/config.guess'
 libtoolize: copying file `build-aux/config.sub'
 libtoolize: copying file `build-aux/install-sh'
 libtoolize: copying file `build-aux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/ltdl.m4'
@ -901,7 +901,7 @@ AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_INIT
 LTDL_INIT([nonrecursive])
 AC_OUTPUT
@ -931,7 +931,7 @@ libtoolize: copying file `acaux/depcomp'
 libtoolize: copying file `acaux/install-sh'
 libtoolize: copying file `acaux/missing'
 libtoolize: copying file `acaux/ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `acm4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `acm4'.
 libtoolize: copying file `acm4/argz.m4'
 libtoolize: copying file `acm4/libtool.m4'
 libtoolize: copying file `acm4/ltdl.m4'
@ -981,7 +981,7 @@ AT_DATA([configure.ac],
 [[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_AUX_DIR([acaux])
-AC_CONFIG_MACRO_DIR([acm4])
+AC_CONFIG_MACRO_DIRS([acm4])
 LT_INIT
 LTDL_INIT([subproject])
 AC_OUTPUT
--- a/tests/mdemo.at
+++ b/tests/mdemo.at
@ -39,7 +39,7 @@ dnl the square-bracket symbols as is.
 [cat >configure.ac <<_EOT_
 AC_INIT([mdemo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 LT_CONFIG_LTDL_DIR([libltdl])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
--- a/tests/no-executables.at
+++ b/tests/no-executables.at
@ -28,7 +28,7 @@ mkdir m4

 AT_DATA([configure.ac],
 [[AC_INIT([no-exec], [1])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])

 # We punt a bit here, to get the results of AC_PROG_CC
 # (and allow it to do link tests) but still error out on
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@ -33,7 +33,7 @@ m4_pushdef([_LT_AT_LTDL_SETUP],
 [[AC_INIT([subdirectory-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_AUX_DIR([ltdl/config])
-AC_CONFIG_MACRO_DIR([ltdl/m4])
+AC_CONFIG_MACRO_DIRS([ltdl/m4])
 AC_CONFIG_LIBOBJ_DIR([ltdl])
 AC_CONFIG_HEADERS([config.h:config.hin])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
--- a/tests/old-ltdl-iface.at
+++ b/tests/old-ltdl-iface.at
@ -36,7 +36,7 @@ AT_SETUP([Makefile.inc])

 AT_DATA([configure.in],
 [[AC_INIT([old-ltdl-iface-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AC_CONFIG_LIBOBJ_DIR([ltdl])
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_HEADERS([config.h])
@ -81,7 +81,7 @@ libtoolize: linking file `./config.guess'
 libtoolize: linking file `./config.sub'
 libtoolize: linking file `./install-sh'
 libtoolize: linking file `./ltmain.sh'
-libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
 libtoolize: linking file `m4/argz.m4'
 libtoolize: linking file `m4/libtool.m4'
 libtoolize: linking file `m4/ltdl.m4'
--- a/tests/recursive.at
+++ b/tests/recursive.at
@ -31,7 +31,7 @@ m4_pushdef([_LT_AT_LTDL_SETUP],
 [[AC_INIT([subdirectory-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([ltdl])
 AC_CONFIG_AUX_DIR([ltdl/config])
-AC_CONFIG_MACRO_DIR([ltdl/m4])
+AC_CONFIG_MACRO_DIRS([ltdl/m4])
 AC_CONFIG_LIBOBJ_DIR([ltdl])
 AC_CONFIG_HEADERS([config.h:config.hin])
 AM_INIT_AUTOMAKE([foreign])
--- a/tests/subproject.at
+++ b/tests/subproject.at
@ -31,7 +31,7 @@ m4_pushdef([_LT_AT_LTDL_SETUP],
 [[AC_INIT([subproject-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([sub/ltdl])
 AC_CONFIG_AUX_DIR([sub/ltdl/config])
-AC_CONFIG_MACRO_DIR([sub/ltdl/m4])
+AC_CONFIG_MACRO_DIRS([sub/ltdl/m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
 LT_WITH_LTDL
--- a/tests/tagdemo.at
+++ b/tests/tagdemo.at
@ -35,7 +35,7 @@ AT_KEYWORDS([libtool])
 AT_DATA([configure.ac],
 [[AC_INIT([tagdemo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC
--- a/tests/template.at
+++ b/tests/template.at
@ -98,7 +98,7 @@ dnl with autoreconf, use:
 dnl AT_DATA(configure.ac,
 dnl [[AC_INIT([template_1], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
 dnl AC_CONFIG_HEADERS([config.h:config-h.in])
-dnl AC_CONFIG_MACRO_DIR([m4])
+dnl AC_CONFIG_MACRO_DIRS([m4])
 dnl AC_CONFIG_AUX_DIR([config])
 dnl AM_INIT_AUTOMAKE([foreign])
 dnl AC_LANG([C++])
@ -294,7 +294,7 @@ dnl
 dnl AT_DATA(src/configure.ac,
 dnl [[AC_INIT([template_2], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
 dnl AC_CONFIG_HEADERS([config.h:config-h.in])
-dnl AC_CONFIG_MACRO_DIR([m4])
+dnl AC_CONFIG_MACRO_DIRS([m4])
 dnl AC_CONFIG_AUX_DIR([config])
 dnl AM_INIT_AUTOMAKE([foreign subdir-objects])
 dnl AC_LANG([C++])
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@ -64,6 +64,11 @@ case $lt_INSTALL in
    ;;
 esac

+# func_extract_trace support
+. "$abs_top_srcdir/build-aux/funclib.sh"
+. "$abs_top_srcdir/build-aux/extract-trace"
+
+
 # Unset some MAKE... variables that may cause $MAKE to act like a
 # recursively invoked sub-make.  Any $MAKE invocation in a test is
 # conceptually an independent invocation.
@ -111,8 +116,19 @@ AT_CHECK([LT_AT_LIBTOOLIZE([$1])],

 # LT_AT_ACLOCAL([OPTIONS])
 # --------------------------
+m4_pattern_allow([^(m4_define|m4_defn|m4_ifndef)$])
 m4_define([LT_AT_ACLOCAL],
-[AT_CHECK([$ACLOCAL $1], [0], [ignore], [ignore])
+[macro_dir=
+func_extract_trace AC_CONFIG_MACRO_DIRS
+test -n "$func_extract_trace_result" \
+    || func_extract_trace AC_CONFIG_MACRO_DIR
+test -n "$func_extract_trace_result" \
+    && macro_dir=" -I $func_extract_trace_result"
+AT_DATA([acinclude.m4],
+[[m4_ifndef([AC_CONFIG_MACRO_DIRS],
+	  [m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
+]])
+LT_AT_CHECK([$ACLOCAL $1${macro_dir}], [0], [ignore], [ignore])
 AT_XFAIL_IF([test no = "$ACLOCAL"])
 AT_KEYWORDS([automake])
 ])
@ -149,7 +165,11 @@ AT_KEYWORDS([autoconf])
 # LT_AT_AUTORECONF([OPTIONS])
 # --------------------------
 m4_define([LT_AT_AUTORECONF],
-[AT_CHECK([$AUTORECONF $1], [0], [ignore], [stderr],
+[AT_DATA([acinclude.m4],
+[[m4_ifndef([AC_CONFIG_MACRO_DIRS],
+	  [m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
+]])
+AT_CHECK([$AUTORECONF $1], [0], [ignore], [stderr],
  [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
 AT_XFAIL_IF(
  [case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac])