bootstrap: ensure gnulib_path is not empty.

diff --git a/ChangeLog b/ChangeLog
index 838d43765bf01c24e22e2fa865d78dec2b8f26bb..245735303f072d0cc1d68a6c3243d4af4984d2ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-14  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * bootstrap (gnulib_path): Default to "gnulib" if it doesn't have a
+       value.  Redirect "git clone" stderr to stdout.
+
 2010-05-09  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * build-aux/bzr-version-gen: New file.

diff --git a/bootstrap b/bootstrap
index a9a778a85e1aee2bc89155dbb1544da69cc11178..b74bc0b76d715a2b9eb9a96fbd8a92212f09fc73 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-04-30.16; # UTC
+scriptversion=2010-05-14.09; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -409,6 +409,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
+test -n "$gnulib_path" || gnulib_path="gnulib"
 
 # Get gnulib files.
 
@@ -424,7 +425,8 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone 2>&1 -h|grep -- --depth > /dev/null \
+        && shallow='--depth 2'|| shallow=
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib