* 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 <ebl...@redhat.com>
---
A lot has happened in gnulib since my last update:
* gnulib 108cfb8...74d5093 (486):
> Don't use AC_LIBOBJ with file names in subdirectories.
> Simplify gl_LIBUNISTRING_VERSION_CMP expansion.
> Reduce dependencies.
> Reduce dependencies.
> time: Undefine more broken macros.
> Choose among AC_DEFUN_ONCE, AC_DEFUN in a way that aclocal understands.
> time: work with mingw + pthreads-win32 library
> Avoid expanding two macros in the wrong order.
> autoupdate
...
I'm not going to list all 486 changes, but some of them
affect a compilation issue on FreeBSD, and some of them
give better (optional) stress testing of compiling m4
with a C++ compiler instead of C.
ChangeLog | 10 ++++++++++
Makefile.am | 2 +-
build-aux/.cvsignore | 1 +
build-aux/.gitignore | 1 +
configure.ac | 1 +
gnulib | 2 +-
m4/gnulib-cache.m4 | 3 ++-
7 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d48b7f0..d66f94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-06-04 Eric Blake <ebl...@redhat.com>
+ 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.
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/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])
--
1.7.0.1
_______________________________________________
M4-patches mailing list
M4-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/m4-patches
