[SCM] GNU M4 source repository branch, branch-1_4, updated. branch-cvs-readonly-8-g94692e6

[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=94692e6c0e3287149061f5e0bd1c4d5dc02e2fd8

The branch, branch-1_4 has been updated
       via  94692e6c0e3287149061f5e0bd1c4d5dc02e2fd8 (commit)
      from  0f7701a19187152180a0b9907fab29d152fc534a (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 94692e6c0e3287149061f5e0bd1c4d5dc02e2fd8
Author: Eric Blake <address@hidden>
Date:   Mon Nov 5 09:22:44 2007 -0700

    Use build-aux directory.
    
    * configure.ac (PACKAGE, VERSION): Delete, since Automake does
    this now.
    (AC_CONFIG_AUX_DIR): Add, with auxiliary files in build-aux
    instead of the top level.
    * bootstrap: Adjust accordingly.
    * m4/gnulib-cache.m4: Add --aux-dir option.
    * doc/Makefile.am (m4.1): Rewrite rule to use build-aux/missing.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 .cvsignore         |    1 +
 .gitignore         |    1 +
 ChangeLog          |   11 +++++++++++
 bootstrap          |   16 ++++++++--------
 configure.ac       |    4 ++--
 doc/Makefile.am    |    2 +-
 m4/gnulib-cache.m4 |    2 +-
 7 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 974d0ee..e24f01a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,6 +2,7 @@
 *.tar.gz
 aclocal.m4
 autom4te.cache
+build-aux
 config.cache
 config.guess
 config.h
diff --git a/.gitignore b/.gitignore
index e150cad..2b4139a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.tar.gz
 aclocal.m4
 autom4te.cache
+build-aux
 config.cache
 config.guess
 config.h
diff --git a/ChangeLog b/ChangeLog
index c2ad2ad..4ecf890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-05  Eric Blake  <address@hidden>
+
+       Use build-aux directory.
+       * configure.ac (PACKAGE, VERSION): Delete, since Automake does
+       this now.
+       (AC_CONFIG_AUX_DIR): Add, with auxiliary files in build-aux
+       instead of the top level.
+       * bootstrap: Adjust accordingly.
+       * m4/gnulib-cache.m4: Add --aux-dir option.
+       * doc/Makefile.am (m4.1): Rewrite rule to use build-aux/missing.
+
 2007-11-02  Eric Blake  <address@hidden>
 
        Update some documentation about version control.
diff --git a/bootstrap b/bootstrap
index a75e32c..686434c 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.
@@ -276,13 +276,13 @@ $AUTORECONF --force --verbose --install || 
func_fatal_error "autoreconf failed"
 ## Gnulib is more up-to-date than automake. ##
 ## ---------------------------------------- ##
 
-func_update "$gnulibdir"/build-aux/config.guess config.guess
-func_update "$gnulibdir"/build-aux/config.sub config.sub
-func_update "$gnulibdir"/build-aux/depcomp depcomp
-func_update "$gnulibdir"/build-aux/install-sh install-sh
-func_update "$gnulibdir"/build-aux/mdate-sh doc/mdate-sh
-func_update "$gnulibdir"/build-aux/missing missing
-func_update "$gnulibdir"/build-aux/texinfo.tex doc/texinfo.tex
+func_update "$gnulibdir"/build-aux/config.guess build-aux/config.guess
+func_update "$gnulibdir"/build-aux/config.sub build-aux/config.sub
+func_update "$gnulibdir"/build-aux/depcomp build-aux/depcomp
+func_update "$gnulibdir"/build-aux/install-sh build-aux/install-sh
+func_update "$gnulibdir"/build-aux/mdate-sh build-aux/mdate-sh
+func_update "$gnulibdir"/build-aux/missing build-aux/missing
+func_update "$gnulibdir"/build-aux/texinfo.tex build-aux/texinfo.tex
 func_update "$gnulibdir"/doc/COPYINGv3 COPYING
 func_update "$gnulibdir"/doc/INSTALL INSTALL
 
diff --git a/configure.ac b/configure.ac
index 11d9487..630c40b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@
 
 AC_PREREQ([2.60])
 AC_INIT([GNU M4], [1.4.10a], address@hidden)
+AC_CONFIG_AUX_DIR([build-aux])
+
 AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 gnu])
-PACKAGE=$PACKAGE_TARNAME; AC_SUBST([PACKAGE])
-VERSION=$PACKAGE_VERSION; AC_SUBST([VERSION])
 
 m4_pattern_forbid([^M4_[A-Z]])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 64698c1..ded347f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,7 +34,7 @@ SUFFIXES = .1
 $(srcdir)/m4.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/m4.c
        @if test -x ../src/m4$(EXEEXT) ; then \
          echo "Updating man page m4.1" ; \
-         $(SHELL) $(top_srcdir)/missing --run \
+         $(SHELL) $(top_srcdir)/build-aux/missing --run \
            help2man --name="macro processor" --source=FSF \
              --info-page=m4 --output=$@ ../src/m4$(EXEEXT) ; \
        else \
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 3dc24c3..4d1727d 100644
--- a/m4/gnulib-cache.m4
+++ b/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=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --with-tests 
--no-libtool --macro-prefix=M4 assert avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs 
getopt gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer 
strtol unlocked-io verror version-etc version-etc-fsf xalloc xprintf 
xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --with-tests 
--no-libtool --macro-prefix=M4 assert avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs 
getopt gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer 
strtol unlocked-io verror version-etc version-etc-fsf xalloc xprintf 
xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])


hooks/post-receive
--
GNU M4 source repository