From: Benjamin Lindner <[email protected]> * build-aux/bootstrap: Add --no-git option, to be used when --gnulib-srcdir points to the exact desired checkout.
Signed-off-by: Eric Blake <[email protected]> --- I'd like to push this in your name, once I have your okay. The (tiny change) notation reflects your copyright status, and is not demeaning the work you put into this. ChangeLog | 6 ++++++ build-aux/bootstrap | 22 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ee388e..d2828a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-20 Benjamin Lindner <[email protected]> (tiny change) + + bootstrap: support --no-git option + * build-aux/bootstrap: Add --no-git option, to be used when + --gnulib-srcdir points to the exact desired checkout. + 2011-01-20 Jim Meyering <[email protected]> init.sh: insert space between each function name and "()" diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 25bc53b..0d73ffb 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-01-14.08; # UTC +scriptversion=2011-01-20.18; # UTC # Bootstrap this package from checked-out sources. @@ -64,6 +64,9 @@ Options: --force Attempt to bootstrap even if the sources seem not to have been checked out. --skip-po Do not download po files. + --no-git Do not update gnulib using git. Requires that + --gnulib-srcdir points to a complete gnulib source + tree If the file $0.conf exists in the same directory as this script, its contents are read as shell variables to configure the bootstrap. @@ -178,6 +181,9 @@ vc_ignore=auto # default. bootstrap_sync=false +# Use git to update gnulib sources +use_git=true + # find_tool ENVVAR NAMES... # ------------------------- # Search for a required program. Use the value of ENVVAR, if set, @@ -253,12 +259,22 @@ do bootstrap_sync=true;; --no-bootstrap-sync) bootstrap_sync=false;; + --no-git) + use_git=false;; *) echo >&2 "$0: $option: unknown option" exit 1;; esac done +# --no-git requires --gnulib-srcdir +if $use_git || test -d "$GNULIB_SRCDIR"; then + : +else + echo "Error: --no-git requires --gnulib-srcdir" >&2 + exit 1 +fi + if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 exit 1 @@ -384,6 +400,10 @@ check_versions() { if test "$app" = libtool; then app=libtoolize fi + # only test for git if not using --no-git + if test "$app" = git; then + $use_git || continue + fi # Honor $APP variables ($TAR, $AUTOCONF, etc.) appvar=`echo $app | tr '[a-z]-' '[A-Z]_'` test "$appvar" = TAR && appvar=AMTAR -- 1.7.3.4
