From 2f9a01b432339ccc612ef051d2ccc314900a14cd Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Wed, 8 Oct 2003 13:12:19 +0000
Subject: [PATCH] * lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Stub out a
 macro that future autopoint/aclocal/automake/autoreconf will be able to trace
 to find where to install local m4 macros. * doc/autoconf.texi (Input):
 Document it. * NEWS: Updated.

---
 ChangeLog               |  8 ++++++++
 NEWS                    |  3 +++
 doc/autoconf.texi       | 13 +++++++++++++
 lib/autoconf/general.m4 | 23 +++++++++++++++++++++++
 4 files changed, 47 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fe12383e..eadc9a87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-08  Gary V. Vaughan  <gary@gnu.org>
+
+	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Stub out a macro
+	that future autopoint/aclocal/automake/autoreconf will be able
+	to trace to find where to install local m4 macros.
+	* doc/autoconf.texi (Input): Document it.
+	* NEWS: Updated.
+
 2003-10-06  Gary V. Vaughan  <gary@gnu.org>
 
 	* lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Add
diff --git a/NEWS b/NEWS
index 6afa02de..ba0ce661 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
   Autoreconf creates the auxiliary directory if needed.  This is
   especially useful for initial "bootstrapping" of fresh CVS checkouts.
 
+** AC_CONFIG_MACRO_DIR
+  Use this macro to declare the directory for local m4 macros for aclocal.
+
 * Major changes in Autoconf 2.57f
 
   Released 2003-10-01, by Akim Demaille.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 39245f45..8f839cdb 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1758,6 +1758,19 @@ name is obsolete because some @code{make} have a rule that creates
 @file{install} from it if there is no @file{Makefile}.
 @end defmac
 
+Similarly, packages that use @command{aclocal} should declare where
+local macros can be found using @code{AC_CONFIG_MACRO_DIR}.
+
+@defmac AC_CONFIG_MACRO_DIR (@var{dir})
+@acindex{CONFIG_MACRO_DIR}
+Future versions of @command{autopoint}, @command{libtoolize},
+@command{aclocal} and @command{autoreconf} will use directory
+@var{dir} as the location of additional local Autoconf macros.  Be
+sure to call this macro directly from @file{configure.ac} so that
+tools that install macros for @command{aclocal} can find the
+declaration before @option{--trace} can be called safely.
+@end defmac
+
 
 @node Output
 @section Outputting Files
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 817068de..968b3509 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1538,6 +1538,29 @@ AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 
 
 
+## ------------------------ ##
+## Finding aclocal macros.  ##
+## ------------------------ ##
+
+
+# AC_CONFIG_MACRO_DIR(DIR)
+# ------------------------
+# Declare directory containing additional macros for aclocal.
+# DIR can be either absolute or relative to $srcdir.
+AC_DEFUN([AC_CONFIG_MACRO_DIR],
+[case $1 in
+  [[\\/]]* | ?:[[\\/]]* ) ac_macro_dir=$1         ;;
+  *)                      ac_macro_dir=$srcdir/$1 ;;
+esac
+if test -d "$ac_macro_dir"; then :
+else
+  AC_MSG_ERROR([cannot find macro directory `$1'])
+fi
+])# AC_CONFIG_MACRO_DIR
+
+
+
+
 ## ----------------------------------- ##
 ## Getting the canonical system type.  ##
 ## ----------------------------------- ##
-- 
2.11.4.GIT