summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2019-08-24 14:56:33 -0400
committerPaul Smith <psmith@gnu.org>2019-08-24 14:56:33 -0400
commit069f2bca995ccbf387eb0943a9933c292c0485c7 (patch)
tree6f06acf492524632f9125347789d4a4fe630ed43 /bootstrap
parent40847ce9b8dbbfa9fcdcf77c9ed14704adfb53a9 (diff)
downloadmake-git-069f2bca995ccbf387eb0943a9933c292c0485c7.tar.gz
* bootstrap: Update from latest gnulib version
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap15
1 files changed, 14 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index 5077e018..05808ee4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2018-07-01.02; # UTC
+scriptversion=2019-01-04.17; # UTC
# Bootstrap this package from checked-out sources.
@@ -142,6 +142,9 @@ die() { warn_ "$@"; exit 1; }
# Configuration.
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
# List of gnulib modules needed.
gnulib_modules=
@@ -970,6 +973,16 @@ fi
bootstrap_post_import_hook \
|| die "bootstrap_post_import_hook failed"
+# Don't proceed if there are uninitialized submodules. In particular,
+# the next step will remove dangling links, which might be links into
+# uninitialized submodules.
+#
+# Uninitialized submodules are listed with an initial dash.
+if $use_git && git submodule | grep '^-' >/dev/null; then
+ die "some git submodules are not initialized. " \
+ "Run 'git submodule init' and bootstrap again."
+fi
+
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
# The following requires GNU find 4.2.3 or newer. Considering the usual