From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 12 Oct 2012 10:54:21 +0000 (+0700)
Subject: bootstrap: work when using fallback shallow gnulib clone.
X-Git-Tag: v2.4.2.418~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ee460c1275481033283388db92d738688761927;p=thirdparty%2Flibtool.git

bootstrap: work when using fallback shallow gnulib clone.

Bootstrapping without --gnulib-srcdir creates a shallow gnulib
clone to run gnulib-tool out of, except that the parent package
is almost certainly using a revision of gnulib before just tha
most recent 2 gnulib revisions.
* bootstrap (func_require_gnulib_submodule): Pull the most
recent 365 revisions, which ought to be enough for a well-
maintained parent package.
Don't forget to run 'git submodule update' to select the correct
gnulib revision.
---

diff --git a/bootstrap b/bootstrap
index 2beabbc11..3d8fed9f1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1388,11 +1388,14 @@ func_require_gnulib_submodule ()
 
         shallow=
         $GIT clone -h 2>&1 |func_grep_q -- --depth \
-            && shallow='--depth 2'
+            && shallow='--depth 365'
 
         func_show_eval "$GIT clone $shallow '$gnulib_url' '$gnulib_path'" \
           func_cleanup_gnulib
 
+        func_show_eval "$GIT submodule update" \
+            'func_fatal_error "Unable to update gnulib submodule."'
+
 	# FIXME: Solaris /bin/sh will try to execute '-' if any of
 	#        these signals are caught after this.
         trap - 1 2 13 15