Update to the newest gnulib.

* gnulib-local/lib/localename.c.diff: Remove file.
* gnulib-local/lib/localename-table.h.diff: Remove file.
* gnulib-local/lib/tsearch.c.diff: Remove file.
* gnulib-local/modules/tsearch.diff: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove them.
* libtextstyle/configure.ac: Update for changed naming convention of module
indicator variables.

diff --git a/.gitignore b/.gitignore
index 6cca49c0e3971166d2f90139b622b7e3d8e0999a..195edc595eee76720ec86f75aef1810a168484b2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@
 /gettext-tools/libgettextpo/c-strstr.c
 /gettext-tools/libgettextpo/c-strstr.h
 /gettext-tools/libgettextpo/c++defs.h
+/gettext-tools/libgettextpo/calloc.c
 /gettext-tools/libgettextpo/cloexec.c
 /gettext-tools/libgettextpo/cloexec.h
 /gettext-tools/libgettextpo/close.c
@@ -130,6 +131,8 @@
 /gettext-tools/libgettextpo/gl_xlist.h
 /gettext-tools/libgettextpo/hard-locale.c
 /gettext-tools/libgettextpo/hard-locale.h
+/gettext-tools/libgettextpo/ialloc.c
+/gettext-tools/libgettextpo/ialloc.h
 /gettext-tools/libgettextpo/iconv.c
 /gettext-tools/libgettextpo/iconv.in.h
 /gettext-tools/libgettextpo/iconv_close.c
@@ -141,6 +144,7 @@
 /gettext-tools/libgettextpo/iconv_open-zos.gperf
 /gettext-tools/libgettextpo/iconv_open.c
 /gettext-tools/libgettextpo/iconveh.h
+/gettext-tools/libgettextpo/idx.h
 /gettext-tools/libgettextpo/intprops.h
 /gettext-tools/libgettextpo/inttypes.in.h
 /gettext-tools/libgettextpo/itold.c
@@ -188,6 +192,7 @@
 /gettext-tools/libgettextpo/rawmemchr.c
 /gettext-tools/libgettextpo/rawmemchr.valgrind
 /gettext-tools/libgettextpo/realloc.c
+/gettext-tools/libgettextpo/reallocarray.c
 /gettext-tools/libgettextpo/relocatable.c
 /gettext-tools/libgettextpo/relocatable.h
 /gettext-tools/libgettextpo/relocatable.valgrind
@@ -280,11 +285,14 @@
 /gettext-tools/libgettextpo/xvasprintf.c
 /gettext-tools/libgettextpo/xvasprintf.h
 /gettext-tools/libgrep/glthread/
+/gettext-tools/libgrep/malloc/
 /gettext-tools/libgrep/gnulib-m4/
 /gettext-tools/libgrep/Makefile.gnulib
+/gettext-tools/libgrep/attribute.h
 /gettext-tools/libgrep/btowc.c
 /gettext-tools/libgrep/c++defs.h
 /gettext-tools/libgrep/cdefs.h
+/gettext-tools/libgrep/dynarray.h
 /gettext-tools/libgrep/intprops.h
 /gettext-tools/libgrep/langinfo.in.h
 /gettext-tools/libgrep/libc-config.h

diff --git a/gnulib b/gnulib
index 6047713aff39dc8a9f94952ecf3b136223605eec..5d357603e8ecd6a256a9b8a34292b3dc7ebec4d4 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 6047713aff39dc8a9f94952ecf3b136223605eec
+Subproject commit 5d357603e8ecd6a256a9b8a34292b3dc7ebec4d4

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index d6004ef1c9a185bf476a6ab44b8a134333f1fe65..300eca0cbd3e9f1a7fb71eef2b35af28bd193390 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -136,8 +136,6 @@ lib/libxml/xpath.in.h \
 lib/libxml/xpathInternals.in.h \
 lib/libxml/xpointer.c \
 lib/libxml/xpointer.in.h \
-lib/localename.c.diff \
-lib/localename-table.h.diff \
 lib/markup.c \
 lib/markup.h \
 lib/mem-hash-map.c \
@@ -146,7 +144,6 @@ lib/obstack.h.diff \
 lib/progname.h.diff \
 lib/regex_internal.h.diff \
 lib/unistd.in.h.diff \
-lib/tsearch.c.diff \
 lib/xerror.c \
 lib/xerror.h \
 lib/xgetcwd.c \
@@ -165,7 +162,6 @@ modules/libtextstyle-dummy \
 modules/libxml \
 modules/markup \
 modules/mem-hash-map \
-modules/tsearch.diff \
 modules/xerror \
 modules/xgetcwd
 

diff --git a/gnulib-local/lib/localename-table.h.diff b/gnulib-local/lib/localename-table.h.diff
deleted file mode 100644 (file)
index 8b99815..0000000
--- a/gnulib-local/lib/localename-table.h.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/lib/localename-table.h b/lib/localename-table.h
-index f365b24..98f5b9f 100644
---- a/lib/localename-table.h
-+++ b/lib/localename-table.h
-@@ -21,11 +21,7 @@
- # include <stddef.h>
- # include <locale.h>
- 
--# ifdef IN_LIBINTL
--#  include "lock.h"
--# else
--#  include "glthread/lock.h"
--# endif
-+# include "glthread/lock.h"
- 
- struct locale_categories_names
-   {

diff --git a/gnulib-local/lib/localename.c.diff b/gnulib-local/lib/localename.c.diff
deleted file mode 100644 (file)
index 14ee659..0000000
--- a/gnulib-local/lib/localename.c.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- localename.c.orig  2021-06-14 15:51:56.574445150 +0200
-+++ localename.c       2021-06-14 15:55:23.703421518 +0200
-@@ -21,11 +21,7 @@
- #include <config.h>
- 
- /* Specification.  */
--#ifdef IN_LIBINTL
--# include "gettextP.h"
--#else
--# include "localename.h"
--#endif
-+#include "localename.h"
- 
- #include <limits.h>
- #include <stdbool.h>
-@@ -46,9 +42,7 @@
- # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__
- #  include <langinfo.h>
- # endif
--# if !defined IN_LIBINTL
--#  include "glthread/lock.h"
--# endif
-+# include "glthread/lock.h"
- # if defined __sun
- #  if HAVE_GETLOCALENAME_L
- /* Solaris >= 12.  */
-@@ -70,9 +64,7 @@
- 
- #if defined _WIN32 && !defined __CYGWIN__
- # define WINDOWS_NATIVE
--# if !defined IN_LIBINTL
--#  include "glthread/lock.h"
--# endif
-+# include "glthread/lock.h"
- #endif
- 
- #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */

diff --git a/gnulib-local/lib/tsearch.c.diff b/gnulib-local/lib/tsearch.c.diff
deleted file mode 100644 (file)
index fd68a1a..0000000
--- a/gnulib-local/lib/tsearch.c.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/lib/tsearch.c b/lib/tsearch.c
-index 2b775b1..dcc16d7 100644
---- a/lib/tsearch.c
-+++ b/lib/tsearch.c
-@@ -92,11 +92,7 @@
- #include <config.h>
- 
- /* Specification.  */
--#ifdef IN_LIBINTL
--# include "tsearch.h"
--#else
--# include <search.h>
--#endif
-+#include <search.h>
- 
- #include <stdlib.h>
- 

diff --git a/gnulib-local/modules/tsearch.diff b/gnulib-local/modules/tsearch.diff
deleted file mode 100644 (file)
index 7b1b01d..0000000
--- a/gnulib-local/modules/tsearch.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/tsearch b/modules/tsearch
-index 4a2b5ed..6ffdf2f 100644
---- a/modules/tsearch
-+++ b/modules/tsearch
-@@ -22,7 +22,7 @@ Include:
- <search.h>
- 
- License:
--LGPL
-+LGPLv2+
- 
- Maintainer:
- all, glibc

diff --git a/libtextstyle/.gitignore b/libtextstyle/.gitignore
index a5c6de8d6fc2cf12a7bc7e9328ee4280087fefa1..64c2a9e81908af51f0d4f3cf681cae50d3a86657 100644 (file)
--- a/libtextstyle/.gitignore
+++ b/libtextstyle/.gitignore
@@ -33,6 +33,7 @@
 /lib/c-strcase.h
 /lib/c-strcasecmp.c
 /lib/c-strncasecmp.c
+/lib/calloc.c
 /lib/cloexec.c
 /lib/cloexec.h
 /lib/close.c
@@ -62,6 +63,7 @@
 /lib/float.c
 /lib/float.in.h
 /lib/fpucw.h
+/lib/free.c
 /lib/frexp.c
 /lib/frexpl.c
 /lib/fstat.c
@@ -92,8 +94,11 @@
 /lib/html-ostream.oo.h
 /lib/html-styled-ostream.oo.c
 /lib/html-styled-ostream.oo.h
+/lib/ialloc.c
+/lib/ialloc.h
 /lib/iconv-ostream.oo.c
 /lib/iconv-ostream.oo.h
+/lib/idx.h
 /lib/intprops.h
 /lib/inttypes.in.h
 /lib/isatty.c
@@ -146,6 +151,8 @@
 /lib/printf-parse.h
 /lib/raise.c
 /lib/read.c
+/lib/realloc.c
+/lib/reallocarray.c
 /lib/safe-read.c
 /lib/safe-read.h
 /lib/safe-write.c

diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac
index df14033ab9485d470d8a383611f4c10a09a9355a..e79417d6a1312e16a5be90249308d7b3ce914c8f 100644 (file)
--- a/libtextstyle/configure.ac
+++ b/libtextstyle/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the toplevel directory of GNU libtextstyle
-dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2021 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -72,8 +72,8 @@ lts_INIT
 
 dnl Arrange that the gnulib-generated <unistd.h> does not declare isatty(). The
 dnl adhoc-tests want to get this declaration from <textstyle.h>, not <unistd.h>.
-GNULIB_ISATTY=0
-GNULIB_MDA_ISATTY=0
+GL_LTS_GNULIB_ISATTY=0
+GL_LTS_GNULIB_MDA_ISATTY=0
 
 dnl Compilation on mingw and Cygwin needs special Makefile rules, because
 dnl 1. when we install a shared library, we must arrange to export