[coreutils] [PATCH] build: update gnulib submodule to latest; bootstrap, too

[Jim Meyering]

FYI,

>From 5e9a7ae46b58ec8c59157b4e16c3773b1e72802b Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 30 Apr 2010 18:27:19 +0200
Subject: [PATCH] build: update gnulib submodule to latest; bootstrap, too

---
 bootstrap |   10 +++++-----
 gnulib    |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap b/bootstrap
index 365a3d9..e55b3d2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-02-24.17; # UTC
+scriptversion=2010-04-30.16; # UTC

 # Bootstrap this package from checked-out sources.

@@ -424,7 +424,7 @@ case ${GNULIB_SRCDIR--} in

     trap cleanup_gnulib 1 2 13 15

-    git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib

@@ -437,7 +437,7 @@ case ${GNULIB_SRCDIR--} in
   if test -d "$GNULIB_SRCDIR"/.git && \
         git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
-    if git submodule --help|grep reference > /dev/null; then
+    if git submodule -h|grep -- --reference > /dev/null; then
       # Prefer the one-liner available in git 1.6.4 or newer.
       git submodule update --init --reference "$GNULIB_SRCDIR" \
         "$gnulib_path" || exit $?
@@ -819,7 +819,7 @@ if test $with_gettext = yes; then
       a\
           '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
-  ' po/Makevars.template >po/Makevars
+  ' po/Makevars.template >po/Makevars || exit 1

   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
@@ -833,7 +833,7 @@ if test $with_gettext = yes; then
         a\
             '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
       }
-    ' <po/Makevars.template >runtime-po/Makevars
+    ' po/Makevars.template >runtime-po/Makevars || exit 1

     # Copy identical files from po to runtime-po.
     (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
diff --git a/gnulib b/gnulib
index 6d126a8..0c6cf5a 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 6d126a8f1bcb55344ff601decd524f53b54234fa
+Subproject commit 0c6cf5ab43555377b99d94febb2d6f23fc3d2cb0
--
1.7.1.rc1.279.g22727