Update after gnulib changed: Fix link errors of gettextpo-1-prg on mingw.

* gettext-tools/configure.ac: Set the module indicator variables
GL_GTPO_GNULIB_{PUTC,FPUTC,FPUTS,FWRITE,FPRINTF} to 0.
* gettext-tools/libgettextpo/Makefile.am (config.h): Undefine REPLACE_FCHDIR
that is defined in the parent config.h.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 1003667c597efc7035016ddfce6d3d7217b0f3d6..3152306df10cc58e0a55595210fd6c8da2d2e379 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-tools directory of GNU gettext
-dnl Copyright (C) 1995-2020 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2022 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
@@ -211,6 +211,14 @@ gtpo_INIT
 dnl Allow libgrep/locale.h to use setlocale_null.h from gnulib-lib/.
 GL_GRGL_GNULIB_SETLOCALE_NULL=1
 
+dnl In libgettextpo/, we don't use the modules putc, fputc, fputs, fwrite,
+dnl fprintf.
+GL_GTPO_GNULIB_PUTC=0
+GL_GTPO_GNULIB_FPUTC=0
+GL_GTPO_GNULIB_FPUTS=0
+GL_GTPO_GNULIB_FWRITE=0
+GL_GTPO_GNULIB_FPRINTF=0
+
 dnl Checks for header files.
 AC_CHECK_HEADERS([pwd.h])
 

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 59b016ee458060cce56c53ca95e7026e8a89f656..96cab97842c7be70ca709df9a7340e0715e76c7e 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2016, 2019-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2016, 2019-2022 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
@@ -154,6 +154,8 @@ config.h: $(BUILT_SOURCES)
          echo '#define GTPO_CONFIG_H'; \
          echo; \
          echo '#include "../config.h"'; \
+         : "We don't use gnulib module 'fchdir' here."; \
+         echo '#undef REPLACE_FCHDIR'; \
          : "Turn all gettext() calls into dgettext() calls."; \
          echo '#define DEFAULT_TEXT_DOMAIN "gettext-tools"'; \
          : "All code is collected in a single library,"; \