FYI: maint: update gnulib

[Akim Demaille]

Installed in maint.

From b2c4c25d4ad3aa6795a527a53ab1e5bb4a9d442c Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Wed, 9 May 2012 10:13:58 +0200
Subject: [PATCH 1/2] maint: update gnulib.

* bootstrap, gnulib: Update.
---
 bootstrap      |   42 ++++++++++++++++++++++++++++++++++++++----
 gnulib         |    2 +-
 lib/.gitignore |    1 +
 m4/.gitignore  |    2 ++
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/bootstrap b/bootstrap
index 16dc15c..c496d29 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-04-16.16; # UTC
+scriptversion=2012-04-26.13; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -36,6 +36,10 @@ nl='
 LC_ALL=C
 export LC_ALL
 
+# Ensure that CDPATH is not set.  Otherwise, the output from cd
+# would cause trouble in at least one use below.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 local_gl_dir=gl
 
 me=$0
@@ -429,6 +433,22 @@ check_versions() {
         GZIP) ;; # Do not use $GZIP:  it contains gzip options.
         *) eval "app=\${$appvar-$app}" ;;
     esac
+
+    # Handle the still-experimental Automake-NG programs specially.
+    # They remain named as the mainstream Automake programs ("automake",
+    # and "aclocal") to avoid gratuitous incompatibilities with
+    # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+    # scripts), but correctly identify themselves (as being part of
+    # "GNU automake-ng") when asked their version.
+    case $app in
+      automake-ng|aclocal-ng)
+        app=`echo "$app" | sed 's/-ng$//'`
+        ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
+          echo "$me: Error: '$app' not found or not from Automake-NG" >&2
+          ret=1
+          continue
+        } ;;
+    esac
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
       # so we have to rely on $? rather than get_version.
@@ -758,9 +778,15 @@ fi
 # Autoreconf runs aclocal before libtoolize, which causes spurious
 # warnings if the initial aclocal is confused by the libtoolized
 # (or worse out-of-date) macro directory.
+# libtoolize 1.9b added the --install option; but we support back
+# to libtoolize 1.5.22, where the install action was default.
 if test $use_libtool = 1; then
-  echo "running: $LIBTOOLIZE --copy --install"
-  $LIBTOOLIZE --copy --install
+  install=
+  case $($LIBTOOLIZE --help) in
+    *--install*) install=--install ;;
+  esac
+  echo "running: $LIBTOOLIZE $install --copy"
+  $LIBTOOLIZE $install --copy
 fi
 
 version_controlled_file() {
@@ -863,7 +889,15 @@ if test $with_gettext = yes; then
     }
   ' po/Makevars.template >po/Makevars || exit 1
 
-  cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in || exit 1
+  # If the 'gettext' module is in use, grab the latest Makefile.in.in.
+  # If only the 'gettext-h' module is in use, assume autopoint already
+  # put the correct version of this file into place.
+  case $gnulib_modules in
+  *gettext-h*) ;;
+  *gettext*)
+    cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in || exit 1
+    ;;
+  esac
 
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
diff --git a/gnulib b/gnulib
index 1a0e0ae..1f96aa0 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 1a0e0aefd4b1fbef0c6e5d990bc01499fd153a0d
+Subproject commit 1f96aa01f72bba8c9a0600280594a1a92bb505fc
diff --git a/lib/.gitignore b/lib/.gitignore
index 5ba545b..5eec743 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -267,3 +267,4 @@
 /xstrndup.h
 /xmemdup0.c
 /xmemdup0.h
+/sys_types.in.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 8f41360..d47aee0 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -176,3 +176,5 @@
 /xalloc.m4
 /xsize.m4
 /xstrndup.m4
+/off_t.m4
+/sys_types_h.m4
-- 
1.7.10.1