From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 17 May 2010 13:26:42 +0000 (+0200)
Subject: bootstrap: fix an error when gnulib is not used as a git submodule
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6eaa8be0da1be37596f215bc66b217a35fa9435;p=pspp

bootstrap: fix an error when gnulib is not used as a git submodule

* build-aux/bootstrap (gnulib_path): If its length is zero then
assign "gnulib" to it.
* build-aux/bootstrap: Redirect "git clone -h" stderr to stdout.
---

diff --git a/ChangeLog b/ChangeLog
index c5560761ab..d5209c5d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-17  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+	bootstrap: fix an error when gnulib is not used as a git submodule
+	* build-aux/bootstrap (gnulib_path): If its length is zero then
+	assign "gnulib" to it.
+	* build-aux/bootstrap: Redirect "git clone -h" stderr to stdout.
+
 2010-05-16  Bruno Haible  <bruno@clisp.org>
 
 	Avoid autoconf warnings about AM_ICONV.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index a9a778a85e..242254922e 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-04-30.16; # UTC
+scriptversion=2010-05-17.18; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -409,6 +409,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.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=
+    shallow=
+    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib