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

[Jim Meyering]

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=7daa47a115af00621ccbf202e61d87e69e5e48b9

The branch, master has been updated
       via  7daa47a115af00621ccbf202e61d87e69e5e48b9 (commit)
       via  dcae1fc7859cdc1bb3235f17f70f398a81033ccf (commit)
       via  b69f240e06b92951d389f8dd291914d61f0b29e4 (commit)
       via  576a8cbe1364da5fdad83562314b9f97f70b5cb8 (commit)
       via  00e9eaeacc5010125429e59f35129820614743a0 (commit)
       via  3b793a96bb043a9ed2e7eea4544cfffcaac7aa3b (commit)
       via  703fbf369a521caa492df0ce38db36691ba358b8 (commit)
      from  fa8beeb3dcd4df6f97183ab29f68c6b3dcc8e844 (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 7daa47a115af00621ccbf202e61d87e69e5e48b9
Author: Jim Meyering <address@hidden>
Date:   Mon Nov 12 20:09:13 2007 +0100

    Add more non-srcdir build support.
    
    * GNUmakefile (dummy): Split a long line.
    Add -v option to autoreconf invocation.

commit dcae1fc7859cdc1bb3235f17f70f398a81033ccf
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 11 21:46:53 2007 +0100

    Add autoreconf's -v option, to give some feedback.
    Don't imply that $(_curr-ver) is the new version string.

commit b69f240e06b92951d389f8dd291914d61f0b29e4
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 11 21:14:20 2007 +0100

    Remove the autoreconf-provided INSTALL, so that we regenerate it.
    
    * GNUmakefile (dummy): Remove INSTALL.

commit 576a8cbe1364da5fdad83562314b9f97f70b5cb8
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 11 20:08:52 2007 +0100

    Remove racy commands to build scripts in bin/ and tests/.
    
    * man/Makefile.am (.x.1): Now that scripts in bin/ and tests/
    are guaranteed to be built, remove the rules that tried to build
    them.  Before, with a parallel build, these rules could lead to
    two processes writing tests/wrapper.in concurrently.

commit 00e9eaeacc5010125429e59f35129820614743a0
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 11 18:02:34 2007 +0100

    Build in man/ only *after* building in bin/ and tests/.
    
    * Makefile.am (SUBDIRS): The man-page-creation process runs $(MAKE)
    in both bin/ and tests/.
    
    Signed-off-by: Jim Meyering <address@hidden>

commit 3b793a96bb043a9ed2e7eea4544cfffcaac7aa3b
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 11 20:05:08 2007 +0100

    Accommodate non-srcdir build-from-checkout.
    
    * build-aux/git-version-gen: Require an additional parameter: $srcdir.
    Use git's --git-dir=$srcdir/.git option.
    Add quotes, in case tarball_version_file contains shell meta-characters.
    * GNUmakefile (_curr-ver): Pass $(srcdir) to git-version-gen.
    * configure.ac: Pass "." to git-version-gen.

commit 703fbf369a521caa492df0ce38db36691ba358b8
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 11 18:08:53 2007 +0100

    Avoid spurious test failures due to version skew.
    
    * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i.

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

Summary of changes:
 ChangeLog                 |   29 +++++++++++++++++++++++++++++
 GNUmakefile               |   13 ++++++++++---
 Makefile.am               |    3 ++-
 build-aux/git-version-gen |   17 +++++++++--------
 configure.ac              |    2 +-
 man/Makefile.am           |   13 ++-----------
 6 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9422056..6b95b48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2007-11-12  Jim Meyering  <address@hidden>
+
+       Add more non-srcdir build support.
+       * GNUmakefile (dummy): Split a long line.
+       Add -v option to autoreconf invocation.
+
+       Remove the autoreconf-provided INSTALL, so that we regenerate it.
+       * GNUmakefile (dummy): Remove INSTALL.
+
+       Remove racy commands to build scripts in bin/ and tests/.
+       * man/Makefile.am (.x.1): Now that scripts in bin/ and tests/
+       are guaranteed to be built, remove the rules that tried to build
+       them.  Before, with a parallel build, these rules could lead to
+       two processes writing tests/wrapper.in concurrently.
+
+       Build in man/ only *after* building in bin/ and tests/.
+       * Makefile.am (SUBDIRS): The man-page-creation process runs $(MAKE)
+       in both bin/ and tests/.
+
+       Accommodate non-srcdir build-from-checkout.
+       * build-aux/git-version-gen: Require an additional parameter: $srcdir.
+       Use git's --git-dir=$srcdir/.git option.
+       Add quotes, in case tarball_version_file contains shell meta-characters.
+       * GNUmakefile (_curr-ver): Pass $(srcdir) to git-version-gen.
+       * configure.ac: Pass "." to git-version-gen.
+
+       Avoid spurious test failures due to version skew.
+       * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i.
+
 2007-11-12  Ralf Wildenhues  <address@hidden>
 
        Avoid warnings about conftest.dSYM directories on Mac OS X Leopard.
diff --git a/GNUmakefile b/GNUmakefile
index 652d015..841a918 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -45,13 +45,20 @@ include Makefile
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoconf and recompiling everything isn't cheap.
+# The $(MAKE) clean is required, to remove all traces of the previous
+# version string, which would otherwise cause a few test failures.
+# Remove the autoreconf-provided INSTALL, so that we regenerate it.
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell build-aux/git-version-gen .version)
+    _curr-ver := $(shell $(srcdir)/build-aux/git-version-gen $(srcdir) 
.version)
     ifneq ($(_curr-ver),$(VERSION))
-      $(info INFO: running autoreconf for new version string: $(_curr-ver))
-      dummy := $(shell rm -rf autom4te.cache; autoreconf -i)
+      $(info INFO: running autoreconf for new version string; old: 
$(_curr-ver))
+      dummy := $(shell                         \
+       rm -rf autom4te.cache;                  \
+       (cd $(srcdir) && autoreconf -i -v)      \
+         && $(MAKE) clean                      \
+         && rm -f INSTALL)
     endif
   endif
 endif
diff --git a/Makefile.am b/Makefile.am
index d243ed7..730291c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,8 @@
 
 # bin/ must be run first, as it builds executables needed for tests.
 # autom4te uses autotest.m4f to generate `testsuite', so build tests last.
-SUBDIRS = bin . lib man doc tests
+# Rules in man/ use scripts from both bin/ and tests/, so *it* goes last.
+SUBDIRS = bin . lib doc tests man
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 5f86625..20c759e 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2007-11-03.22
+scriptversion=2007-11-11.19
 
 # Copyright (C) 2007 Free Software Foundation
 #
@@ -24,14 +24,15 @@ scriptversion=2007-11-03.22
 # - from a git repository in which the git-describe command below
 #   produces useful output (thus requiring at least one signed tag)
 # - from a non-git-repo directory containing a .version file, which
-#   presumes this script is invoked like "./git-version-gen .version".
+#   presumes this script is invoked like "./git-version-gen $srcdir .version".
 
 case $# in
-    1) ;;
-    *) echo 1>&2 "Usage: $0 \$srcdir/.version"; exit 1;;
+    2) ;;
+    *) echo 1>&2 "Usage: $0 \$srcdir .version"; exit 1;;
 esac
 
-tarball_version_file=$1
+srcdir=$1
+tarball_version_file=$srcdir/$2
 nl='
 '
 
@@ -39,7 +40,7 @@ nl='
 # then try git-describe, then default.
 if test -f $tarball_version_file
 then
-    v=`cat $tarball_version_file` || exit 1
+    v=`cat "$tarball_version_file"` || exit 1
     case $v in
        *$nl*) v= ;; # reject multi-line output
        [0-9]*) ;;
@@ -52,8 +53,8 @@ fi
 if test -n "$v"
 then
     : # use $v
-elif test -d .git \
-    && v=`git describe --abbrev=4 HEAD 2>/dev/null` \
+elif test -d "$srcdir/.git" \
+    && v=`git --git-dir="$srcdir/.git" describe --abbrev=4 HEAD 2>/dev/null` \
     && case $v in
         v[0-9]*) ;;
         *) (exit 1) ;;
diff --git a/configure.ac b/configure.ac
index 3a79310..9adafa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # We need AC_CONFIG_TESTDIR, AC_PROG_SED, AC_PROG_GREP.
 AC_PREREQ([2.60])
 
-AC_INIT([GNU Autoconf], m4_esyscmd([build-aux/git-version-gen .version]),
+AC_INIT([GNU Autoconf], m4_esyscmd([build-aux/git-version-gen . .version]),
        address@hidden)
 AC_SUBST([PACKAGE_NAME])dnl
 AC_CONFIG_SRCDIR([ChangeLog])
diff --git a/man/Makefile.am b/man/Makefile.am
index 406893a..9485d28 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf man pages.
 
-# Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004-2007 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -51,16 +51,7 @@ MOSTLYCLEANFILES = $(srcdir)/*.t
 SUFFIXES = .x .1
 
 .x.1:
-       @program=`expr "/$*" : '.*/\(.*\)'` && \
-       case $$program in \
-       config.*) ;; \
-       *) \
-         for dir in $(top_builddir)/bin $(top_builddir)/tests; do \
-           echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program && \
-           (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \
-         done;; \
-       esac
-       echo "Updating man page $@"
+       @echo "Updating man page $@"
        
PATH="$(top_builddir)/tests$(PATH_SEPARATOR)$(top_srcdir)/build-aux$(PATH_SEPARATOR)$$PATH";
 \
        export PATH; \
        $(HELP2MAN) \


hooks/post-receive
--
GNU Autoconf source repository