From a6eaa8be0da1be37596f215bc66b217a35fa9435 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 17 May 2010 15:26:42 +0200 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ build-aux/bootstrap | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5560761a..d5209c5d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-17 Giuseppe Scrivano + + 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 Avoid autoconf warnings about AM_ICONV. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index a9a778a85..242254922 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 -- 2.11.0