[SCM] GNU Autoconf source repository branch, master, updated. v2.61a-400-g34d1406

[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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=34d1406addd357d1d44c5b85921fa167e45e2a65

The branch, master has been updated
       via  34d1406addd357d1d44c5b85921fa167e45e2a65 (commit)
      from  6893b8be8a760345c1af22dad7b7751aa7e87973 (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 34d1406addd357d1d44c5b85921fa167e45e2a65
Author: Eric Blake <address@hidden>
Date:   Fri Mar 21 22:43:01 2008 -0600

    * GNUmakefile: Resynchronize with gnulib.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog   |    2 ++
 GNUmakefile |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef48fbf..4e1cf74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-21  Eric Blake  <address@hidden>
 
+       * GNUmakefile: Resynchronize with gnulib.
+
        Document more uses of $cross_compiling.
        * doc/autoconf.texi (Runtime): Document that a temporary override
        is permissible.
diff --git a/GNUmakefile b/GNUmakefile
index fac11d3..38dd126 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -44,15 +44,19 @@ include Makefile
 -include $(srcdir)/cfg.mk
 include $(srcdir)/maint.mk
 
+# Allow cfg.mk to override these.
+_build-aux ?= build-aux
 _autoreconf ?= autoreconf
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoreconf and recompiling everything isn't cheap.
-ifeq (0,$(MAKELEVEL))
+_have-git-version-gen := \
+  $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes)
+ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
     $(filter dist% alpha beta major,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell cd $(srcdir) && ./build-aux/git-version-gen \
+    _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \
                    $(srcdir)/.tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))


hooks/post-receive
--
GNU Autoconf source repository