From 652c73271aa3feeb9ca1524ba2af8bd48929b931 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 14 Dec 2009 14:11:22 -0700 Subject: Update to latest gnulib. * gnulib: Update. * ltdl/m4/gnulib-cache.m4: Import xoset. * m4/output.c (includes): Ensure that gnulib oset usage will call xalloc_die on memory failure. * Makefile.am (src/getopt.h): Update snippet from gnulib. (LINK_WARNING_H, ARG_NONNULL_H): New macros. Signed-off-by: Eric Blake (cherry picked from commit 43b9828d5bfe5c9be902ad86053e59f3a5ab2dd4) --- ChangeLog | 8 ++++++++ Makefile.am | 10 +++++++--- gnulib | 2 +- ltdl/m4/gnulib-cache.m4 | 5 +++-- m4/output.c | 3 ++- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b747e822..95ce8dea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-01-05 Eric Blake + Update to latest gnulib. + * gnulib: Update. + * ltdl/m4/gnulib-cache.m4: Import xoset. + * m4/output.c (includes): Ensure that gnulib oset usage will + call xalloc_die on memory failure. + * Makefile.am (src/getopt.h): Update snippet from gnulib. + (LINK_WARNING_H, ARG_NONNULL_H): New macros. + Fix testsuite failure on newer glibc. * tests/testsuite.at (AT_CHECK_M4): Tolerate alternate getopt spellings. diff --git a/Makefile.am b/Makefile.am index fdaab47a..c4af0c40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am - template for generating Makefile via Automake ## -## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -## Free Software Foundation, Inc. +## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +## 2010 Free Software Foundation, Inc. ## ## This file is part of GNU M4. ## @@ -108,9 +108,12 @@ BUILT_SOURCES += src/$(GETOPT_H) endif EXTRA_DIST += src/getopt.c src/getopt1.c src/getopt.in.h src/getopt_int.h +LINK_WARNING_H = $(srcdir)/$(config_aux_dir)/link-warning.h +ARG_NONNULL_H = $(srcdir)/$(config_aux_dir)/arg-nonnull.h + # We need the following in order to create an when the # system doesn't have one that works with the given compiler. -src/getopt.h: src/getopt.in.h +src/getopt.h: src/getopt.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ @@ -118,6 +121,7 @@ src/getopt.h: src/getopt.in.h -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ < $(srcdir)/src/getopt.in.h; \ } > $@-t && \ mv -f $@-t $@ diff --git a/gnulib b/gnulib index 51983dcb..0e0f8f12 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 51983dcb2ce9d20eb1f72d0b877e40fe0de07e87 +Subproject commit 0e0f8f12ec241c0f1c1f21f960bb5cf908a0fa3c diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4 index 3ea93ba9..eb2ce98f 100644 --- a/ltdl/m4/gnulib-cache.m4 +++ b/ltdl/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2009 Free Software Foundation, Inc. +# Copyright (C) 2002-2010 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 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops inttypes memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xprintf-posix xstrndup xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops inttypes memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([local]) @@ -83,6 +83,7 @@ gl_MODULES([ xalloc xalloc-die xmemdup0 + xoset xprintf-posix xstrndup xvasprintf-posix diff --git a/m4/output.c b/m4/output.c index b2f6530a..0535d93a 100644 --- a/m4/output.c +++ b/m4/output.c @@ -1,6 +1,6 @@ /* GNU m4 -- A simple macro processor Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2004, - 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU M4. @@ -26,6 +26,7 @@ #include "clean-temp.h" #include "exitfail.h" #include "gl_avltree_oset.h" +#include "gl_xoset.h" #include "intprops.h" #include "quotearg.h" #include "xvasprintf.h" -- cgit v1.2.1