gnulib: update.

* bootstrap.conf (bootstrap_sync): True again.
It was disabled while waiting for changes to be integrated
in gnulib's bootstrap, which was done long ago.
* bootstrap, gnulib: Update.

diff --git a/bootstrap b/bootstrap
index edac17e0729bbc4f86f08c703e2991d822a9768e..31eb651f64bd38de1e33e464c7505a6ddd6540c1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-01-23.10; # UTC
+scriptversion=2012-02-11.09; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -137,7 +137,7 @@ tests_base=tests
 gnulib_extra_files=''
 
 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
-gnulib_tool_option_extras='--makefile-name=gnulib.mk'
+gnulib_tool_option_extras=
 
 # Other locale categories that need message catalogs.
 EXTRA_LOCALE_CATEGORIES=
@@ -423,7 +423,7 @@ check_versions() {
       $use_git || continue
     fi
     # Honor $APP variables ($TAR, $AUTOCONF, etc.)
-    appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
+    appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'`
     test "$appvar" = TAR && appvar=AMTAR
     case $appvar in
         GZIP) ;; # Do not use $GZIP:  it contains gzip options.
@@ -604,7 +604,7 @@ if $bootstrap_sync; then
 fi
 
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
 
 # Get translations.
 
@@ -807,7 +807,8 @@ for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file || exit
 done
 
-bootstrap_post_import_hook
+bootstrap_post_import_hook \
+  || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
 
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
 # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.

diff --git a/bootstrap.conf b/bootstrap.conf
index e9b8ba6c83e55f095570af3779086beddadabfba..2dbcb057a26e1e85a1ae8549fc61884e4d5c0c23 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -82,4 +82,4 @@ bootstrap_epilogue()
 # the bootstrap entry from the file .x-update-copyright, and add any
 # needed copyright years to the copyright statement in the bootstrap
 # script.
-# FIXME: temporary bootstrap_sync=true
+bootstrap_sync=true

diff --git a/gnulib b/gnulib
index 0e9d9267fa36c5493b36c0a2b2e422da101ee4b4..55cc8db041f845c2e82ed10aa192ac200ab3f530 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 0e9d9267fa36c5493b36c0a2b2e422da101ee4b4
+Subproject commit 55cc8db041f845c2e82ed10aa192ac200ab3f530