[PATCH] bootstrap: fix for latest gnulib

[Pavel Raiskup]

This is just hotfix to unblock the build against gnulib, but
a better fix is on TODO.

* .gitignore: Mention files from 'assure' gnulib module.
* bootstrap.conf (src_modules): Add 'assure', this hack in
bootstrap.conf is not able (or doesn't want) to calculate
transitive dependencies correctly.
* build-aux/gnulib: Sync with upstream.
* build-aux/m4/gnulib-cache.m4: Regenerate.
---
 .gitignore                   | 1 +
 bootstrap.conf               | 1 +
 build-aux/gnulib             | 2 +-
 build-aux/m4/gnulib-cache.m4 | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b196d98..e698cb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ Makefile.inc
 /po/POTFILES
 /po/Rules-quot
 /po/stamp-po
+/src/assure.h
 /src/getopt*
 /src/m4
 /src/version-etc*
diff --git a/bootstrap.conf b/bootstrap.conf
index b48b650..255ad5e 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -59,6 +59,7 @@ gnulib_non_module_files=$gnulib_non_module_files"
 # List dependencies here too; we don't extract them, otherwise dependent
 # modules could end up being imported to src/ *and* gnu/!
 src_modules='
+assure
 getopt-gnu
 getopt-posix
 version-etc-fsf
diff --git a/build-aux/gnulib b/build-aux/gnulib
index 79002fd..097a592 160000
--- a/build-aux/gnulib
+++ b/build-aux/gnulib
@@ -1 +1 @@
-Subproject commit 79002fdd9f556694728f5ebc2ea0c43c14ef476d
+Subproject commit 097a5928a785bae77ed1255e57b6553dd1912efe
diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4
index 145b3da..46e39ca 100644
--- a/build-aux/m4/gnulib-cache.m4
+++ b/build-aux/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu 
--source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc 
--tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests 
--no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild 
avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein 
config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat 
flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext 
git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops 
inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp 
obstack obstack-printf-posix progname propername quote regex regexprops-generic 
rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool 
stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright 
vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset 
xprintf-posix xstrndup xvasprintf-posix
+#   gnulib-tool --import --local-dir=build-aux/gl --lib=libgnu 
--source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc 
--tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests 
--no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild 
avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein 
config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat 
flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext 
git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops 
inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp 
obstack obstack-printf-posix progname propername quote regex regexprops-generic 
rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool 
stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright 
vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset 
xprintf-posix xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([build-aux/gl])
-- 
2.7.4