configury: move autoconf macros to build-aux subdirectory.

* ltdl/m4: Move from here...
* build-aux/m4: ...to here.
* configure.ac (AC_CONFIG_MACRO_DIR): Adjust.
* Makefile.am (config_macro_dir, ACLOCAL_AMFLAGS): Adjust.
* build-aux/m4/gnulib-cache.m4: Regenerate.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

13 files changed, 5 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index cd1d234f..0cc3e838 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,11 +21,11 @@
 ## Written by Gary V. Vaughan <gary@gnu.org>
 
 config_aux_dir	= build-aux
-config_macro_dir= ltdl/m4
+config_macro_dir= $(config_aux_dir)/m4
 
 SUBDIRS		= po gnu . doc tests/gnu
 
-ACLOCAL_AMFLAGS = -I ltdl/m4
+ACLOCAL_AMFLAGS = -I build-aux/m4
 AUTOMAKE_OPTIONS = nostdinc
 
 gitlog_to_changelog	= $(srcdir)/$(config_aux_dir)/gitlog-to-changelog
diff --git a/ltdl/m4/debug.m4 b/build-aux/m4/debug.m4
index 2bb5739d..2bb5739d 100644
--- a/ltdl/m4/debug.m4
+++ b/build-aux/m4/debug.m4
diff --git a/ltdl/m4/gmp.m4 b/build-aux/m4/gmp.m4
index 36e60516..36e60516 100644
--- a/ltdl/m4/gmp.m4
+++ b/build-aux/m4/gmp.m4
diff --git a/ltdl/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4
index cee2e9b5..6ac73fb1 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/build-aux/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu --source-base=gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([build-aux/gl])
@@ -107,7 +107,7 @@ gl_MODULES([
 gl_WITH_CXX_TESTS
 gl_AVOID([])
 gl_SOURCE_BASE([gnu])
-gl_M4_BASE([ltdl/m4])
+gl_M4_BASE([build-aux/m4])
 gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests/gnu])
diff --git a/ltdl/m4/m4-error.m4 b/build-aux/m4/m4-error.m4
index 27695cbb..27695cbb 100644
--- a/ltdl/m4/m4-error.m4
+++ b/build-aux/m4/m4-error.m4
diff --git a/ltdl/m4/m4-getopt.m4 b/build-aux/m4/m4-getopt.m4
index a2d3a4e3..a2d3a4e3 100644
--- a/ltdl/m4/m4-getopt.m4
+++ b/build-aux/m4/m4-getopt.m4
diff --git a/ltdl/m4/m4-gettext.m4 b/build-aux/m4/m4-gettext.m4
index 3c40d730..3c40d730 100644
--- a/ltdl/m4/m4-gettext.m4
+++ b/build-aux/m4/m4-gettext.m4
diff --git a/ltdl/m4/m4-obstack.m4 b/build-aux/m4/m4-obstack.m4
index fab387ba..fab387ba 100644
--- a/ltdl/m4/m4-obstack.m4
+++ b/build-aux/m4/m4-obstack.m4
diff --git a/ltdl/m4/m4-regex.m4 b/build-aux/m4/m4-regex.m4
index e7fa38af..e7fa38af 100644
--- a/ltdl/m4/m4-regex.m4
+++ b/build-aux/m4/m4-regex.m4
diff --git a/ltdl/m4/m4-rename.m4 b/build-aux/m4/m4-rename.m4
index 4062cdec..4062cdec 100644
--- a/ltdl/m4/m4-rename.m4
+++ b/build-aux/m4/m4-rename.m4
diff --git a/ltdl/m4/m4-syscmd.m4 b/build-aux/m4/m4-syscmd.m4
index 514201fa..514201fa 100644
--- a/ltdl/m4/m4-syscmd.m4
+++ b/build-aux/m4/m4-syscmd.m4
diff --git a/ltdl/m4/stackovf.m4 b/build-aux/m4/stackovf.m4
index d1812230..d1812230 100644
--- a/ltdl/m4/stackovf.m4
+++ b/build-aux/m4/stackovf.m4
diff --git a/configure.ac b/configure.ac
index bda7490e..36e0a7fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_INIT([GNU M4], m4_defn([M4_VERSION]), [bug-m4@gnu.org])
 
 AC_CONFIG_SRCDIR([src/m4.h])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([ltdl/m4])
+AC_CONFIG_MACRO_DIR([build-aux/m4])
 AC_CONFIG_LIBOBJ_DIR([gnu])
 AC_CONFIG_TESTDIR([tests])
 AC_CONFIG_HEADERS([gnu/config.h:gnu/config.hin])