use build-aux

[Eric Blake]

Now that we use git, it's much easier to move directories around without losing 
history (compared to how things were in CVS).  I'm committing this patch to 
head, and a similar one to the branch, to use the build-aux directory, 
consistent with other GNU projects, rather than . on the branch and ltdl/config 
on head.

From: Eric Blake <address@hidden>
Date: Mon, 5 Nov 2007 13:11:17 -0700
Subject: [PATCH] For consistency with other GNU projects, use build-aux 
directory.

* configure.ac (AC_CONFIG_AUX_DIR): Change ltdl/config to
build-aux.
* bootstrap (config_aux_dir): Likewise.
* Makefile.am (config_aux_dir): Likewise.
* ltdl/m4/gnulib-cache.m4: Use --aux-dir option.

Signed-off-by: Eric Blake <address@hidden>
---
 .cvsignore              |    1 +
 .gitignore              |    1 +
 ChangeLog               |    9 +++++++++
 Makefile.am             |    2 +-
 bootstrap               |    4 ++--
 configure.ac            |    2 +-
 ltdl/m4/gnulib-cache.m4 |    2 +-
 7 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1b25efa..f36af79 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,6 +4,7 @@ ABOUT-NLS
 aclocal.m4
 aclocal.m4t
 autom4te.cache
+build-aux
 config.cache
 config.h
 config-h.in
diff --git a/.gitignore b/.gitignore
index ed1f298..21bfd60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ ABOUT-NLS
 aclocal.m4
 aclocal.m4t
 autom4te.cache
+build-aux
 config.cache
 config.h
 config-h.in
diff --git a/ChangeLog b/ChangeLog
index d4c0157..1526687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-05  Eric Blake  <address@hidden>
+
+       For consistency with other GNU projects, use build-aux directory.
+       * configure.ac (AC_CONFIG_AUX_DIR): Change ltdl/config to
+       build-aux.
+       * bootstrap (config_aux_dir): Likewise.
+       * Makefile.am (config_aux_dir): Likewise.
+       * ltdl/m4/gnulib-cache.m4: Use --aux-dir option.
+
 2007-11-02  Eric Blake  <address@hidden>
 
        Update some documentation about version control.
diff --git a/Makefile.am b/Makefile.am
index d9f107f..a2e67d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 ##
 ## Written by Gary V. Vaughan <address@hidden>
 
-config_aux_dir = ltdl/config
+config_aux_dir = build-aux
 config_macro_dir= ltdl/m4
 
 SUBDIRS                = ltdl po gnu tests/gnu .
diff --git a/bootstrap b/bootstrap
index 4f453b4..140ed0e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2007-11-02
+# bootstrap (GNU M4) version 2007-11-05
 # Written by Gary V. Vaughan  <address@hidden>
 
 # Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -64,7 +64,7 @@ export LC_ALL
 
 package=m4
 ltdldir=ltdl
-config_aux_dir=$ltdldir/config
+config_aux_dir=build-aux
 config_macro_dir=$ltdldir/m4
 bailout_cb=:
 
diff --git a/configure.ac b/configure.ac
index 1dce77a..d9790e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_PREREQ([2.60])
 AC_INIT([GNU M4], [1.9a], address@hidden)
 
 AC_CONFIG_SRCDIR([src/m4.h])
-AC_CONFIG_AUX_DIR([ltdl/config])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([ltdl/m4])
 AC_CONFIG_LIBOBJ_DIR([gnu])
 AC_CONFIG_TESTDIR([tests])
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4
index 927082e..9c17a78 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/ltdl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-
base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --with-tests --
libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp 
cloexec close-stream closein config-h configmake dirname error exit fdl fflush 
filenamecat fopen-safer free fseeko gendocs gettext gnupload gpl-3.0 mkstemp 
obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer 
strnlen strtol tempname unlocked-io verror xalloc xalloc-die xprintf-posix 
xstrndup xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-
base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=build-aux --with-tests --
libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp 
cloexec close-stream closein config-h configmake dirname error exit fdl fflush 
filenamecat fopen-safer free fseeko gendocs gettext gnupload gpl-3.0 mkstemp 
obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer 
strnlen strtol tempname unlocked-io verror xalloc xalloc-die xprintf-posix 
xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
-- 
1.5.3.2