[SCM] GNU M4 source repository branch, branch-1_4, updated. v1.4.10b-5-gbbd4dc7

[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=bbd4dc7a69f52ed1c8e36702f540102a0c9bc50c

The branch, branch-1_4 has been updated
       via  bbd4dc7a69f52ed1c8e36702f540102a0c9bc50c (commit)
      from  dbe3bcf161eacc799d06f5c57a879d806d44f0a6 (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 bbd4dc7a69f52ed1c8e36702f540102a0c9bc50c
Author: Eric Blake <address@hidden>
Date:   Mon Mar 3 10:02:15 2008 -0700

    More maintainer build adjustments.
    
    * configure.ac (AC_CONFIG_LINKS): Link GNUMakefile into VPATH
    build tree, but only if autoconf is new enough.
    * GNUmakefile (_have-Makefile, _dummy): Don't pollute Makefile.am
    namespace.
    (_is-dist-target): Support out-of-tree VPATH build.
    (check, install, dist, distcheck) [!_have-Makefile]: Forward
    common build targets on to all to get nicer error messages.
    * Makefile.maint (makefile-check, news-date-check)
    (changelog-check, m4-check, vc-diff-check, web-manual): Work in
    VPATH builds.
    * m4/gnulib-cache.m4: Remove obsolete free module.  Import memchr2
    for later use.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog          |   16 ++++++++++++++++
 GNUmakefile        |   19 +++++++++++++------
 Makefile.maint     |   12 ++++++------
 configure.ac       |    7 +++++++
 m4/gnulib-cache.m4 |    4 ++--
 5 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee2208a..0730173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-03-03  Eric Blake  <address@hidden>
+
+       More maintainer build adjustments.
+       * configure.ac (AC_CONFIG_LINKS): Link GNUMakefile into VPATH
+       build tree, but only if autoconf is new enough.
+       * GNUmakefile (_have-Makefile, _dummy): Don't pollute Makefile.am
+       namespace.
+       (_is-dist-target): Support out-of-tree VPATH build.
+       (check, install, dist, distcheck) [!_have-Makefile]: Forward
+       common build targets on to all to get nicer error messages.
+       * Makefile.maint (makefile-check, news-date-check)
+       (changelog-check, m4-check, vc-diff-check, web-manual): Work in
+       VPATH builds.
+       * m4/gnulib-cache.m4: Remove obsolete free module.  Import memchr2
+       for later use.
+
 2008-02-26  Eric Blake  <address@hidden>
 
        * NEWS: Fix typos.
diff --git a/GNUmakefile b/GNUmakefile
index 4fc9393..7423843 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,16 +32,17 @@ else
 SHELL = sh
 endif
 
-have-Makefile := $(shell test -f Makefile && echo yes)
+_have-Makefile := $(shell test -f Makefile && echo yes)
 
 # If the user runs GNU make but has not yet run ./configure,
 # give them a diagnostic.
-ifeq ($(have-Makefile),yes)
+ifeq ($(_have-Makefile),yes)
 
 # Make tar archive easier to reproduce.
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
 
 include Makefile
+
 _curr-ver := $(VERSION)
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
@@ -49,21 +50,22 @@ _curr-ver := $(VERSION)
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell build-aux/git-version-gen .tarball-version)
+    _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))
-      dummy := $(shell rm -rf autom4te.cache; autoreconf)
+      _dummy := $(shell rm -rf autom4te.cache; (cd $(srcdir) && autoreconf))
       _created_version_file = 1
     endif
   endif
 endif
 
 ifneq ($(_curr-ver),$(VERSION))
-  dummy := $(shell echo $(_curr-ver) > .version)
+  _dummy := $(shell echo $(_curr-ver) > .version)
 endif
 
 ifneq ($(_created_version_file),1)
-  dummy := $(shell test -f .version || echo $(VERSION) > .version)
+  _dummy := $(shell test -f .version || echo $(VERSION) > .version)
 endif
 
 include $(srcdir)/Makefile.cfg
@@ -76,6 +78,11 @@ all:
        @echo "You must run ./configure before running \`make'." 1>&2
        @exit 1
 
+check: all
+install: all
+dist: all
+distcheck: all
+
 endif
 
 # Tell version 3.79 and up of GNU make to not build goals in this
diff --git a/Makefile.maint b/Makefile.maint
index 9256c6d..df89fdb 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -42,12 +42,12 @@ my_distdir = $(PACKAGE)-$(VERSION)
 # not @...@ in Makefile.am, now that we can rely on automake
 # to emit a definition for each substituted variable.
 makefile-check:
-       grep -nE '@[A-Z_0-9]+@' `find . -name Makefile.am` \
+       grep -nE '@[A-Z_0-9]+@' `find $(srcdir) -name Makefile.am` \
          && { echo 'Makefile.maint: use $$(...), not @...@' 1>&2; exit 1; } || 
:
 
 news-date-check: NEWS version-check
        today=`date +%Y-%m-%d`;                                         \
-       if head NEWS | grep '^\*.* $(VERSION_REGEXP) ('$$today')'       \
+       if head $(srcdir)/NEWS | grep '^\*.* $(VERSION_REGEXP) ('$$today')'     
\
            >/dev/null; then                                            \
          :;                                                            \
        else                                                            \
@@ -56,7 +56,7 @@ news-date-check: NEWS version-check
        fi
 
 changelog-check:
-       if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$'        \
+       if head $(srcdir)/ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$'      
\
            >/dev/null; then                                            \
          :;                                                            \
        else                                                            \
@@ -65,12 +65,12 @@ changelog-check:
        fi
 
 m4-check:
-       @grep -n 'AC_DEFUN([^[]' m4/*.m4 \
+       @grep -n 'AC_DEFUN([^[]' $(srcdir)/m4/*.m4 \
          && { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \
               exit 1; } || :
 
 vc-diff-check:
-       $(VC) diff > vc-diffs || :
+       $(VC) diff -- $(srcdir) > vc-diffs || :
        if test -s vc-diffs; then                               \
          cat vc-diffs;                                         \
          echo "Some files are locally modified:" 1>&2;         \
@@ -222,6 +222,6 @@ delta-xdelta: prev-tarball new-tarball got-xdelta
 .PHONY: web-manual
 web-manual:
        @cd ./doc ; \
-         $(SHELL) ../gendocs.sh $(PACKAGE) \
+         $(SHELL) $(srcdir)/build-aux/gendocs.sh $(PACKAGE) \
            "GNU $(PACKAGE)- GNU macro processor"
        @echo " *** Upload the doc/manual directory to web-cvs."
diff --git a/configure.ac b/configure.ac
index 2eb699c..5a61691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,13 @@ M4_WITH_DMALLOC
 
 AC_CONFIG_COMMANDS([stamp-h], [[test -z "$CONFIG_HEADERS" || date > stamp-h]])
 
+dnl Allow maintainer rules under GNU make even in VPATH builds.  This does
+dnl not work in autoconf 2.61 or earlier, but we don't want to require
+dnl non-maintainers to use unreleased autoconf, hence the version test.
+dnl TODO remove the version check once autoconf 2.62 is released.
+m4_if(m4_version_compare([2.61a.100], m4_defn([AC_AUTOCONF_VERSION])), [1], [],
+      [AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])])
+
 AC_CONFIG_FILES([Makefile
                 doc/Makefile
                 lib/Makefile
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 0dbf39c..eb05868 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,11 +15,11 @@
 
 
 # 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=build-aux --with-tests 
--no-libtool --macro-prefix=M4 announce-gen assert avltree-oset binary-io 
clean-temp cloexec close-stream closein config-h error fdl fflush flexmember 
fopen-safer free fseeko gendocs getopt git-version-gen gnupload gpl-3.0 
intprops memmem mkstemp obstack quote regex stdbool stdint stdlib-safer strtod 
strtol unlocked-io vasnprintf-posix 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 announce-gen assert avltree-oset binary-io 
clean-temp cloexec close-stream closein config-h error fdl fflush flexmember 
fopen-safer fseeko gendocs getopt git-version-gen gnupload gpl-3.0 intprops 
memchr2 memmem mkstemp obstack quote regex stdbool stdint stdlib-safer strtod 
strtol unlocked-io vasnprintf-posix 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])
-gl_MODULES([announce-gen assert avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h error fdl fflush flexmember fopen-safer free 
fseeko gendocs getopt git-version-gen gnupload gpl-3.0 intprops memmem mkstemp 
obstack quote regex stdbool stdint stdlib-safer strtod strtol unlocked-io 
vasnprintf-posix verror version-etc version-etc-fsf xalloc xprintf 
xvasprintf-posix])
+gl_MODULES([announce-gen assert avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h error fdl fflush flexmember fopen-safer fseeko 
gendocs getopt git-version-gen gnupload gpl-3.0 intprops memchr2 memmem mkstemp 
obstack quote regex stdbool stdint stdlib-safer strtod strtol unlocked-io 
vasnprintf-posix verror version-etc version-etc-fsf xalloc xprintf 
xvasprintf-posix])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])


hooks/post-receive
--
GNU M4 source repository