[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] gnulib: update
From: |
Akim Demaille |
Subject: |
[PATCH 1/5] gnulib: update |
Date: |
Sat, 12 Jan 2019 09:41:27 +0100 |
---
bootstrap | 14 ++++++++++++--
gnulib | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/bootstrap b/bootstrap
index 5264d9f1..5b08e7e2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
#! /bin/sh
# Print a version string.
-scriptversion=2018-10-13.05; # UTC
+scriptversion=2019-01-04.17; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2019 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -963,6 +963,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
diff --git a/gnulib b/gnulib
index ce6b5cfa..315eb5ff 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit ce6b5cfac8dc60297d433bc868d32469dc06c36d
+Subproject commit 315eb5ffc17685e13a608513b5bcbe2e10eda629
--
2.20.1