Support bootstrap --gnulib-srcdir=DIR.

I saw `bootstrap' doesn't accept --gnulib-srcdir as it is already done
by other projects using gnulib.  It doesn't add a new feature as it can
be already done specifying GNULIB_SRCDIR, it just make the script more
similar to scripts used by other projects doing a bootstrap from
gnulib.

* bootstrap: Add --gnulib-srcdir option, which overrides
GNULIB_SRCDIR, for consistency with gnulib bootstrap.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit d7879f327c28e6a206aa93d009e27224cf6b4b16)

2 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 69cb4294..d5f2ad70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-02  Giuseppe Scrivano  <gscrivano@gnu.org>  (tiny change)
+
+	Support bootstrap --gnulib-srcdir=DIR.
+	* bootstrap: Add --gnulib-srcdir option, which overrides
+	GNULIB_SRCDIR, for consistency with gnulib bootstrap.
+
 2010-03-01  Eric Blake  <eblake@redhat.com>
 
 	Mention release of version 1.4.14.
diff --git a/bootstrap b/bootstrap
index ad123046..b1f5fa8a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2010-01-05
+# bootstrap (GNU M4) version 2010-03-02
+
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
@@ -27,6 +28,12 @@
 # Usage: $progname [options]
 
 # -f      --force            bootstrap even when sources are not from git
+#         --gnulib-srcdir=DIRNAME
+#                            Specify the local directory where gnulib
+#                            sources reside.  Use this if you already
+#                            have gnulib sources on your machine, and
+#                            do not want to waste your bandwidth downloading
+#                            them again.  Defaults to $GNULIB_SRCDIR.
 #         --skip-po          skip downloading pofiles
 # -v      --version          print version information
 # -h,-?   --help             print short or long help message
@@ -215,6 +222,8 @@ func_update ()
     shift
     case $opt in
       -f|--force)       vcs_only_file=                                  ;;
+      --gnulib-srcdir=*)
+        GNULIB_SRCDIR=`expr "X$opt" : 'X--gnulib-srcdir=\(.*\)'`        ;;
       --skip-po)        SKIP_PO=t                                       ;;
       -\?|-h)           func_usage                                      ;;
       --help)           func_help                                       ;;