[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.14-4-g6fe27d4

[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=6fe27d4e717b758f43282c5857ab2c151abb2cd8

The branch, branch-1.4 has been updated
       via  6fe27d4e717b758f43282c5857ab2c151abb2cd8 (commit)
       via  1359a849055a66eddffe7753485e0f29fb85ef31 (commit)
       via  810968964c8db18c06fbc40ea035b9b19611e7ed (commit)
      from  a90f35d7c17b51e8afea9f6d7e2daddeff135c9d (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 6fe27d4e717b758f43282c5857ab2c151abb2cd8
Author: Eric Blake <address@hidden>
Date:   Fri Jun 4 09:18:08 2010 -0600

    Update to newer gnulib.
    
    * gnulib: Update to latest, and include C++ tests.
    * configure.ac (gl_CXX_CHOICE_DEFAULT_NO): Make default for C++
    tests be disabled...
    * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): ...but run them when
    building package.
    * m4/gnulib-cache.m4: Regenerate.
    * build-aux/.cvsignore: Likewise.
    * build-aux/.gitignore: Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 1359a849055a66eddffe7753485e0f29fb85ef31
Author: Eric Blake <address@hidden>
Date:   Fri Jun 4 06:07:38 2010 -0600

    Fix build on newer glibc.
    
    POSIX allows, but does not require, that <fcntl.h> implicitly
    includes <sys/stat.h>.  Until recent glibc, most systems did
    this implicit inclusion, and m4 was mistakenly relying on it.
    
    * src/m4.h (includes): Add <sys/stat.h>.
    * THANKS: Update.
    Reported by Todd Rinaldo.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 810968964c8db18c06fbc40ea035b9b19611e7ed
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Feb 27 22:48:55 2010 +0100

    Support bootstrap --gnulib-srcdir=DIR.
    
    I saw `bootstrap' doesn't accept --gnulib-srcdir as it is already done
    by other projects using gnulib.  It doesn't add a new feature as it can
    be already done specifying GNULIB_SRCDIR, it just make the script more
    similar to scripts used by other projects doing a bootstrap from
    gnulib.
    
    * bootstrap: Add --gnulib-srcdir option, which overrides
    GNULIB_SRCDIR, for consistency with gnulib bootstrap.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit d7879f327c28e6a206aa93d009e27224cf6b4b16)

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

Summary of changes:
 ChangeLog            |   23 +++++++++++++++++++++++
 Makefile.am          |    2 +-
 THANKS               |    2 ++
 bootstrap            |   10 +++++++++-
 build-aux/.cvsignore |    1 +
 build-aux/.gitignore |    1 +
 configure.ac         |    1 +
 gnulib               |    2 +-
 m4/gnulib-cache.m4   |    3 ++-
 src/m4.h             |    1 +
 10 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3da0dee..d66f94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-06-04  Eric Blake  <address@hidden>
+
+       Update to newer gnulib.
+       * gnulib: Update to latest, and include C++ tests.
+       * configure.ac (gl_CXX_CHOICE_DEFAULT_NO): Make default for C++
+       tests be disabled...
+       * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): ...but run them when
+       building package.
+       * m4/gnulib-cache.m4: Regenerate.
+       * build-aux/.cvsignore: Likewise.
+       * build-aux/.gitignore: Likewise.
+
+       Fix build on newer glibc.
+       * src/m4.h (includes): Add <sys/stat.h>.
+       * THANKS: Update.
+       Reported by Todd Rinaldo.
+
+2010-03-02  Giuseppe Scrivano  <address@hidden>  (tiny change)
+
+       Support bootstrap --gnulib-srcdir=DIR.
+       * bootstrap: Add --gnulib-srcdir option, which overrides
+       GNULIB_SRCDIR, for consistency with gnulib bootstrap.
+
 2010-02-24  Eric Blake  <address@hidden>
 
        Release Version 1.4.14.
diff --git a/Makefile.am b/Makefile.am
index 4a8cbfc..1ac3c77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ ACLOCAL_AMFLAGS = -I m4
 ## Enough users install GNU M4 as gm4 that we make sure 'make installcheck'
 ## will handle that, prior to making a release.
 DISTCHECK_CONFIGURE_FLAGS = --enable-changeword --program-prefix=g \
-       --enable-gcc-warnings
+       --enable-gcc-warnings --enable-silent-rules --enable-cxx
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
diff --git a/THANKS b/THANKS
index f43e2aa..6f49e78 100644
--- a/THANKS
+++ b/THANKS
@@ -43,6 +43,7 @@ Frank Schwidom          address@hidden
 Gary V. Vaughan         address@hidden
 Geoff Russell           address@hidden
 Giovanni Toffetti       address@hidden
+Giuseppe Scrivano       address@hidden
 Greg A. Woods           address@hidden
 Hal Peterson            address@hidden
 Hoang Uong              address@hidden
@@ -114,6 +115,7 @@ Steve Williamson        address@hidden
 Steven Augart           address@hidden
 Thomas Klausner         address@hidden
 Thorsten Ohl            address@hidden
+Todd Rinaldo            address@hidden
 Tom G. Christensen      address@hidden
 Tom McConnell           address@hidden
 Tom Quinn               address@hidden
diff --git a/bootstrap b/bootstrap
index a53d86c..6f44e26 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2010-01-05
+# bootstrap (GNU M4) version 2010-03-02
 # Written by Gary V. Vaughan  <address@hidden>
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
@@ -24,6 +24,12 @@
 # Usage: $progname [options]
 
 # -f      --force            bootstrap even when sources are not from git
+#         --gnulib-srcdir=DIRNAME
+#                            Specify the local directory where gnulib
+#                            sources reside.  Use this if you already
+#                            have gnulib sources on your machine, and
+#                            do not want to waste your bandwidth downloading
+#                            them again.  Defaults to $GNULIB_SRCDIR.
 # -v      --version          print version information
 # -h,-?   --help             print short or long help message
 
@@ -190,6 +196,8 @@ func_update ()
     case $opt in
       # Separate optargs to short options:
       -f|--force)       vcs_only_file=                                  ;;
+      --gnulib-srcdir=*)
+        GNULIB_SRCDIR=`expr "X$opt" : 'X--gnulib-srcdir=\(.*\)'`        ;;
       -\?|-h)           func_usage                                      ;;
       --help)           func_help                                       ;;
       --version)        func_version                                    ;;
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index 8114aea..e44a555 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -1,5 +1,6 @@
 announce-gen
 arg-nonnull.h
+c++defs.h
 config.rpath
 gendocs.sh
 git-version-gen
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index cf7ea23..7144d03 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,5 +1,6 @@
 /announce-gen
 /arg-nonnull.h
+/c++defs.h
 /config.rpath
 /gendocs.sh
 /git-version-gen
diff --git a/configure.ac b/configure.ac
index a4efbf4..66d1596 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_CONFIG_SRCDIR([src/m4.h])
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
 AC_PROG_CC
+AC_DEFUN([gl_CXX_CHOICE_DEFAULT_NO])
 M4_EARLY
 
 # M4 is single-threaded; so we can optimize gnulib code by using this:
diff --git a/gnulib b/gnulib
index 108cfb8..74d5093 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 108cfb803174abf17eb101e9999b9d1a642ce1ba
+Subproject commit 74d509383fe30bb5511a978b52e4f8ecae37826b
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 97d3890..103bc16 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 --tests-base=tests 
--aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests 
--makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 announce-gen assert 
autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream 
closein config-h dirname error execute fdl-1.3 fflush filenamecat fopen 
fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update 
gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile 
manywarnings memchr2 mkstemp obstack pipe progname regex sigaction stdbool 
stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright 
vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset 
xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests 
--avoid=tls-tests --makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 
announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec 
close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat 
fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update 
gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile 
manywarnings memchr2 mkstemp obstack pipe progname regex sigaction stdbool 
stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright 
vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset 
xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -77,6 +77,7 @@ gl_MODULES([
   xprintf
   xvasprintf-posix
 ])
+gl_WITH_CXX_TESTS
 gl_AVOID([lock-tests tls-tests])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
diff --git a/src/m4.h b/src/m4.h
index ccd9936..70dc7a8 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 
 #include "binary-io.h"


hooks/post-receive
-- 
GNU M4 source repository