Bump gnulib to latest.

Switch to using the gettext-h module, which I believe should work
exactly the same as before, just that the Autoconf macros get pulled
in from gettext rather than gnulib when bootstrapping.

diff --git a/gnulib b/gnulib
index 233419c39c6d13d84439b95766328a238ffb6518..c9b44f214c7c798c7701c7a281584e262b263655 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 233419c39c6d13d84439b95766328a238ffb6518
+Subproject commit c9b44f214c7c798c7701c7a281584e262b263655

diff --git a/m4/.gitignore b/m4/.gitignore
index ab28204011118c998dd1efdfec985e1ca9c38ef2..33f5b1e19b6eb01c496d6b2795f82934eddebe40 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,69 +1,55 @@
-00gnulib.m4
-codeset.m4
-configmake.m4
-errno_h.m4
-extensions.m4
-extern-inline.m4
-fcntl-o.m4
-getdelim.m4
-getline.m4
-getopt.m4
-gettext.m4
-glibc2.m4
-glibc21.m4
-gnulib-common.m4
-gnulib-comp.m4
-gnulib-tool.m4
-iconv.m4
-iconv_h.m4
-iconv_open.m4
-include_next.m4
-inline.m4
-intdiv0.m4
-intl.m4
-intldir.m4
-intlmacosx.m4
-intmax.m4
-inttypes-pri.m4
-inttypes_h.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-libtool.m4
-libunistring-base.m4
-localcharset.m4
-lock.m4
-longlong.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
-malloc.m4
-multiarch.m4
-nls.m4
-nocrash.m4
-off_t.m4
-po.m4
-printf-posix.m4
-progtest.m4
-readline.m4
-realloc.m4
-size_max.m4
-ssize_t.m4
-stdbool.m4
-stddef_h.m4
-stdint.m4
-stdint_h.m4
-stdio_h.m4
-stdlib_h.m4
-sys_types_h.m4
-threadlib.m4
-tls.m4
-uintmax_t.m4
-unistd_h.m4
-visibility.m4
-warn-on-use.m4
-wchar_t.m4
-wint_t.m4
-xsize.m4
+/00gnulib.m4
+/absolute-header.m4
+/codeset.m4
+/errno_h.m4
+/extensions.m4
+/extern-inline.m4
+/getdelim.m4
+/getline.m4
+/getopt.m4
+/gettext.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/host-cpu-c-abi.m4
+/iconv.m4
+/iconv_h.m4
+/iconv_open.m4
+/include_next.m4
+/inline.m4
+/intl-thread-locale.m4
+/intlmacosx.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
+/libtool.m4
+/libunistring-base.m4
+/limits-h.m4
+/localcharset.m4
+/lock.m4
+/ltoptions.m4
+/ltsugar.m4
+/ltversion.m4
+/lt~obsolete.m4
+/multiarch.m4
+/nls.m4
+/nocrash.m4
+/off_t.m4
+/pid_t.m4
+/po.m4
+/progtest.m4
+/pthread_rwlock_rdlock.m4
+/readline.m4
+/ssize_t.m4
+/stdbool.m4
+/stddef_h.m4
+/stdint.m4
+/stdio_h.m4
+/sys_types_h.m4
+/threadlib.m4
+/tls.m4
+/unistd_h.m4
+/warn-on-use.m4
+/wchar_t.m4
+/wint_t.m4
+/zzgnulib.m4

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 2a38a49a218dc50f426ebe7ac42059e74f57206f..5faa6b6c3576d33731b44025924ae0ef54148d9f 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License,
 # this file may be distributed as part of a program that
@@ -27,13 +27,31 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk.in --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files getopt-gnu gettext localcharset lock readline striconv tls
+# gnulib-tool --import \
+#  --lib=libgnu \
+#  --source-base=lib \
+#  --m4-base=m4 \
+#  --doc-base=doc \
+#  --tests-base=tests \
+#  --aux-dir=. \
+#  --makefile-name=gnulib.mk.in \
+#  --conditional-dependencies \
+#  --libtool \
+#  --macro-prefix=gl \
+#  --no-vc-files \
+#  getopt-gnu \
+#  gettext-h \
+#  localcharset \
+#  lock \
+#  readline \
+#  striconv \
+#  tls
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
   getopt-gnu
-  gettext
+  gettext-h
   localcharset
   lock
   readline