[PATCH 1/2] AC_CONFIG_MACRO_DIR: accept more than one argument

[Stefano Lattarini]

This will allow projects to use several m4 macro local dirs.  This is
especially important for projects that are used as nested subpackages
of larger projects.

See also:
<http://lists.gnu.org/archive/html/autoconf/2011-12/msg00037.html>
<http://lists.gnu.org/archive/html/automake-patches/2012-07/msg00010.html>

* doc/autoconf.texi (@node "Input" @defmac "AC_CONFIG_MACRO_DIR"):
Update signature of and comments about AC_CONFIG_MACRO_DIR.
* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Likewise.  No need to
do other changes because this macro expands to empty anyway, and only
exists to be traced by other tools like aclocal and autoreconf.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 doc/autoconf.texi       |   17 +++++++++--------
 lib/autoconf/general.m4 |    6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3457f12..f9d744b 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2100,17 +2100,18 @@ files.  For instance it is called by macros like 
@code{AC_PROG_INSTALL}
 Similarly, packages that use @command{aclocal} should declare where
 local macros can be found using @code{AC_CONFIG_MACRO_DIR}.
 
address@hidden AC_CONFIG_MACRO_DIR (@var{dir})
address@hidden AC_CONFIG_MACRO_DIR (@var{dir1} address@hidden ... @var{dirN}])
 @acindex{CONFIG_MACRO_DIR}
-Specify @var{dir} as the location of additional local Autoconf macros.
-This macro is intended for use by future versions of commands like
address@hidden that trace macro calls.  It should be called
-directly from @file{configure.ac} so that tools that install macros for
address@hidden can find the macros' declarations.
+Specify the given directories as the location of additional local Autoconf
+macros.  This macro is intended for use by future versions of commands like
address@hidden or @command{aclocal} that trace macro calls.
+It should be called directly from @file{configure.ac} so that tools that
+install macros for @command{aclocal} can find the macros' declarations.
 
 Note that if you use @command{aclocal} from Automake to generate
address@hidden, you must also set @code{ACLOCAL_AMFLAGS = -I
address@hidden in your top-level @file{Makefile.am}.  Due to a limitation in
address@hidden, you must also set
address@hidden = -I @var{dir1} [-I @var{dir2} ... -I @var{dirN}]}
+in your top-level @file{Makefile.am}.  Due to a limitation in
 the Autoconf implementation of @command{autoreconf}, these include
 directives currently must be set on a single line in @file{Makefile.am},
 without any backslash-newlines.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index adfae1d..71ab237 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1725,9 +1725,9 @@ AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 ## ------------------------ ##
 
 
-# AC_CONFIG_MACRO_DIR(DIR)
-# ------------------------
-# Declare directory containing additional macros for aclocal.
+# AC_CONFIG_MACRO_DIR(DIR-1 [DIR-2 ... DIR-n])
+# --------------------------------------------
+# Declare directories containing additional macros for aclocal.
 AC_DEFUN([AC_CONFIG_MACRO_DIR], [])
 
 
-- 
1.7.9.5