[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-11-g639eaea

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=639eaea0351edb82552a5ddce2103207b5e40e08

The branch, master has been updated
       via  639eaea0351edb82552a5ddce2103207b5e40e08 (commit)
       via  270995012df7ec0ba36116e760ea5e08a65db4ff (commit)
      from  4ccde147dd426daa27b2bbaa9bfc6d3587e9ddd4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 639eaea0351edb82552a5ddce2103207b5e40e08
Author: Eric Blake <address@hidden>
Date:   Mon Nov 5 13:14:03 2007 -0700

    Ignore bootstrap leftovers.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 270995012df7ec0ba36116e760ea5e08a65db4ff
Author: Eric Blake <address@hidden>
Date:   Mon Nov 5 13:11:17 2007 -0700

    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>

-----------------------------------------------------------------------

Summary of changes:
 .cvsignore              |    1 +
 .gitignore              |    1 +
 ChangeLog               |    9 +++++++++
 Makefile.am             |    2 +-
 bootstrap               |    4 ++--
 configure.ac            |    2 +-
 ltdl/m4/gnulib-cache.m4 |    2 +-
 po/.cvsignore           |    1 +
 po/.gitignore           |    1 +
 9 files changed, 18 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])
diff --git a/po/.cvsignore b/po/.cvsignore
index 1b5b2d6..3796311 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -12,6 +12,7 @@ Makefile
 Makefile.in
 Makefile.in.in
 Makevars.template
+m4.html
 POTFILES
 quot.sed
 remove-potcdate.sed
diff --git a/po/.gitignore b/po/.gitignore
index 1b5b2d6..3796311 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -12,6 +12,7 @@ Makefile
 Makefile.in
 Makefile.in.in
 Makevars.template
+m4.html
 POTFILES
 quot.sed
 remove-potcdate.sed


hooks/post-receive
--
GNU M4 source repository