[PATCH 3/3] build: update to latest gnulib

[Eric Blake]

A lot has changed in the last year; I really wish I could spend more
time on maintaining m4.

* gnulib: Update to latest, for a number of improvements.
* missing: Break symlink in order to work around automake version
mismatch issue.
* .gitignore: Exclude new gnulib files.
* m4/gnulib-cache.m4: Regenerate.
---
 .gitignore         |    1 +
 ChangeLog          |    7 ++
 build-aux/missing  |  219 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |   25 ++++--
 5 files changed, 246 insertions(+), 8 deletions(-)
 mode change 120000 => 100755 build-aux/missing

diff --git a/.gitignore b/.gitignore
index 0ea0794..bf4eea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 .version
 aclocal.m4
 autom4te.cache
+/build-aux/snippet
 config.cache
 /config.guess
 config.h
diff --git a/ChangeLog b/ChangeLog
index 37e1e18..b8fda00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-06-25  Eric Blake  <address@hidden>

+       build: update to latest gnulib
+       * gnulib: Update to latest, for a number of improvements.
+       * missing: Break symlink in order to work around automake version
+       mismatch issue.
+       * .gitignore: Exclude new gnulib files.
+       * m4/gnulib-cache.m4: Regenerate.
+
        maint: update copyright year
        * all files: Run 'make update-copyright'.

diff --git a/build-aux/missing b/build-aux/missing
deleted file mode 120000
index 9b777ed..0000000
--- a/build-aux/missing
+++ /dev/null
@@ -1 +0,0 @@
-../gnulib/build-aux/missing
\ No newline at end of file
diff --git a/build-aux/missing b/build-aux/missing
new file mode 100755
index 0000000..59b04fc
--- /dev/null
+++ b/build-aux/missing
@@ -0,0 +1,218 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2012-06-26.03; # UTC
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <address@hidden>, 1996.
+
+# This program 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 2, or (at your option)
+# any later version.
+
+# This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+# In the cases where this matters, 'missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case $1 in
+
+  --run)
+    shift
+    ;;
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <address@hidden>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+# Normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# advise the user how to get it.
+case $program in
+
+  aclocal*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
+         to install the Automake and Perl packages.  Grab them from
+         any GNU archive site."
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+         you modified '${configure_ac}'.  You might want to install the
+         Autoconf and GNU m4 packages.  Grab them from any GNU
+         archive site."
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acconfig.h' or '${configure_ac}'.  You might want
+         to install the Autoconf and GNU m4 packages.  Grab them
+         from any GNU archive site."
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+         You might want to install the Automake and Perl packages.
+         Grab them from any GNU archive site."
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: '$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get '$1' as part of Autoconf from any GNU
+         archive site."
+    ;;
+
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: '$1' $msg.  You should only need it if
+         you modified a '.y' file.  You may need the Bison package
+         in order for those modifications to take effect.  You can get
+         Bison from any GNU archive site."
+    ;;
+
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.l' file.  You may need the Flex package
+         in order for those modifications to take effect.  You can get
+         Flex from any GNU archive site."
+    ;;
+
+  help2man*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+        you modified a dependency of a manual page.  You may need the
+        Help2man package in order for those modifications to take
+        effect.  You can get Help2man from any GNU archive site."
+    ;;
+
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.texi' or '.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy 'make' (AIX,
+         DU, IRIX).  You might want to install the Texinfo package or
+         the GNU make package.  Grab either from any GNU archive site."
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: '$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the 'README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing '$1' program."
+    ;;
+
+esac
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/gnulib b/gnulib
index bcbcf0c..91af317 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit bcbcf0c59cec0e91db318eccdc564852bafa3c67
+Subproject commit 91af317680862c24bc4b23ba6f98f9f8e5995a3e
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 6da839f..92feafb 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_DOMAIN([])
-- 
1.7.10.2