+2018-04-09 Colin Watson <cjwatson@debian.org>
+
+ bootstrap: allow non-submodule control of gnulib
+ * build-aux/bootstrap: Honour GNULIB_URL and GNULIB_REVISION in
+ bootstrap.conf when fetching gnulib using "git clone" or via
+ GNULIB_SRCDIR.
+
2018-05-21 Paul Eggert <eggert@cs.ucla.edu>
crypto: omit stream ops Emacs doesn’t need
#! /bin/sh
# Print a version string.
-scriptversion=2018-04-28.14; # UTC
+scriptversion=2018-05-27.20; # UTC
# Bootstrap this package from checked-out sources.
trap cleanup_gnulib 1 2 13 15
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
+ if test -z "$GNULIB_REVISION"; then
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ fi
+ git clone $shallow ${GNULIB_URL:-git://git.sv.gnu.org/gnulib} \
+ "$gnulib_path" || cleanup_gnulib
trap - 1 2 13 15
fi
;;
esac
+ if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
+ && ! git_modules_config submodule.gnulib.url >/dev/null; then
+ (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
+ fi
+
# $GNULIB_SRCDIR now points to the version of gnulib to use, and
# we no longer need to use git or $gnulib_path below here.