It's been quite a while (2393 commits).
* gnulib: Update to latest.
* m4/gnulib-cache.m4: Regenerate.
* missing: Break symlink in order to work around automake version
mismatch issue.
* .gitignore: Update.
* .cvsignore: Likewise.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
.gitignore | 1 +
ChangeLog | 8 ++++++++
build-aux/.cvsignore | 3 ---
build-aux/.gitignore | 3 ---
gnulib | 2 +-
m4/gnulib-cache.m4 | 25 +++++++++++++++++++------
6 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0aac84c..28bbd8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
aclocal.m4
autom4te.cache
/build-aux/missing
+/build-aux/snippet
config.cache
/config.guess
config.h
diff --git a/ChangeLog b/ChangeLog
index 30b444b..bc01374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-09-04 Eric Blake <ebl...@redhat.com>
+ build: pick up latest gnulib fixes
+ * gnulib: Update to latest.
+ * m4/gnulib-cache.m4: Regenerate.
+ * missing: Break symlink in order to work around automake version
+ mismatch issue.
+ * .gitignore: Update.
+ * .cvsignore: Likewise.
+
build: mark several pure functions
* src/m4.h (M4_GNUC_PURE): New macro.
* src/m4.c (fault_handler): Mark pure.
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index e44a555..3119fce 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -1,6 +1,4 @@
announce-gen
-arg-nonnull.h
-c++defs.h
config.rpath
gendocs.sh
git-version-gen
@@ -10,4 +8,3 @@ link-warning.h
update-copyright
useless-if-before-free
vc-list-files
-warn-on-use.h
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 7144d03..4d70d8d 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,6 +1,4 @@
/announce-gen
-/arg-nonnull.h
-/c++defs.h
/config.rpath
/gendocs.sh
/git-version-gen
@@ -10,4 +8,3 @@
/update-copyright
/useless-if-before-free
/vc-list-files
-/warn-on-use.h
diff --git a/gnulib b/gnulib
index bcbcf0c..3a9002d 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit bcbcf0c59cec0e91db318eccdc564852bafa3c67
+Subproject commit 3a9002d3cc63da7110f133b1040d2d2b0aad8305
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 6da839f..ff9c510 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,9 +1,21 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
@@ -15,7 +27,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 --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 fclose 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 progname regex rename
sigaction sigpipe spawn-pipe stdbool stdint stdlib-safer strsignal strstr
strtod 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-conditional-dependencies
--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 fclose 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 progname regex rename sigaction sigpipe spawn-pipe stdbool stdint
stdlib-safer strsignal strstr strtod 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])
@@ -91,3 +103,4 @@ gl_LIB([libm4])
gl_MAKEFILE_NAME([gnulib.mk])
gl_MACRO_PREFIX([M4])
gl_PO_DOMAIN([])
+gl_WITNESS_C_MACRO([])
--
1.7.11.4
_______________________________________________
M4-patches mailing list
M4-patches@gnu.org
https://lists.gnu.org/mailman/listinfo/m4-patches
