Update after gnulib changed.

Previously, different gnulib-tool invocations within the scope of the same
configure.ac interfered with each other (through the GNULIB_* indicator macros,
used in the generated .h files), and libgrep relied on it. Now, each gnulib-tool
invocation needs its own copy of the generated .h files, in particular locale.h.
Needed for the localeconv() override on native Windows.

* autogen.sh: When invoking gnulib-tool for libgrep, don't avoid 'locale' and
the other header file modules.
* gettext-tools/configure.ac: Set GL_GRGL_GNULIB_SETLOCALE_NULL to 1.

diff --git a/.gitignore b/.gitignore
index 049c89be4de77f55bb52dfff9873747cfd9555cb..e4b491640af2ecef734d4ee864c2a71a8275d518 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -292,14 +292,19 @@
 /gettext-tools/libgrep/glthread/
 /gettext-tools/libgrep/gnulib-m4/
 /gettext-tools/libgrep/Makefile.gnulib
+/gettext-tools/libgrep/_Noreturn.h
+/gettext-tools/libgrep/arg-nonnull.h
 /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/inttypes.in.h
 /gettext-tools/libgrep/langinfo.in.h
 /gettext-tools/libgrep/libc-config.h
+/gettext-tools/libgrep/limits.in.h
+/gettext-tools/libgrep/locale.in.h
 /gettext-tools/libgrep/localeconv.c
 /gettext-tools/libgrep/malloc/dynarray.h
 /gettext-tools/libgrep/malloc/dynarray-skeleton.c
@@ -319,7 +324,17 @@
 /gettext-tools/libgrep/regex_internal.c
 /gettext-tools/libgrep/regex_internal.h
 /gettext-tools/libgrep/regexec.c
+/gettext-tools/libgrep/stdbool.in.h
+/gettext-tools/libgrep/stddef.in.h
+/gettext-tools/libgrep/stdint.in.h
+/gettext-tools/libgrep/stdlib.in.h
+/gettext-tools/libgrep/sys_types.in.h
+/gettext-tools/libgrep/unistd.c
+/gettext-tools/libgrep/unistd.in.h
 /gettext-tools/libgrep/warn-on-use.h
+/gettext-tools/libgrep/wchar.in.h
+/gettext-tools/libgrep/wctype-h.c
+/gettext-tools/libgrep/wctype.in.h
 /gettext-tools/libgrep/windows-initguard.h
 /gettext-tools/libgrep/wcrtomb.c
 /gettext-tools/man/x-to-1.in
@@ -838,9 +853,20 @@ core
 /gettext-tools/libgettextpo/uniwidth.h
 /gettext-tools/libgettextpo/wchar.h
 /gettext-tools/libgettextpo/wctype.h
+/gettext-tools/libgrep/inttypes.h
 /gettext-tools/libgrep/langinfo.h
+/gettext-tools/libgrep/limits.h
+/gettext-tools/libgrep/locale.h
+/gettext-tools/libgrep/stdbool.h
+/gettext-tools/libgrep/stddef.h
+/gettext-tools/libgrep/stdint.h
+/gettext-tools/libgrep/stdlib.h
+/gettext-tools/libgrep/unistd.h
+/gettext-tools/libgrep/wchar.h
+/gettext-tools/libgrep/wctype.h
 /gettext-tools/libgrep/malloc/dynarray-skeleton.gl.h
 /gettext-tools/libgrep/malloc/dynarray.gl.h
+/gettext-tools/libgrep/sys/types.h
 /gettext-tools/po/??@*.insert-header
 /gettext-tools/po/remove-potcdate.sed
 /gettext-tools/src/gettext.res

diff --git a/autogen.sh b/autogen.sh
index f30cfcf74ebdf0ebfac7e6735364b23a91cd93de..2fe1f0e92fef8fcfb2fbbdcc34445e3c0df32a4f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -287,7 +287,16 @@ if ! $skip_gnulib; then
     regex
   '
   $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \
-    --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then echo --avoid=$m; fi; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP || exit $?
+    --import \
+    `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do \
+       if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then \
+         case $m in \
+           locale | stdbool | stddef | stdint | stdlib | unistd | wchar | wctype-h) ;; \
+           *) echo --avoid=$m ;; \
+         esac; \
+       fi; \
+     done` \
+    $GNULIB_MODULES_TOOLS_FOR_LIBGREP || exit $?
   # In gettext-tools/libgettextpo:
   # This is a subset of the GNULIB_MODULES_FOR_SRC.
   GNULIB_MODULES_LIBGETTEXTPO='

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index c40711504b22e5f90d55daa52bae98a3fff8cca3..1003667c597efc7035016ddfce6d3d7217b0f3d6 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -208,6 +208,9 @@ gl_INIT
 grgl_INIT
 gtpo_INIT
 
+dnl Allow libgrep/locale.h to use setlocale_null.h from gnulib-lib/.
+GL_GRGL_GNULIB_SETLOCALE_NULL=1
+
 dnl Checks for header files.
 AC_CHECK_HEADERS([pwd.h])