Update after gnulib changed: Fix link errors on MSVC.

* gettext-runtime/configure.ac: For the expansion of DLL_VARIABLE, test
WOE32DLL, not _DLL.
* gettext-tools/configure.ac: Set the module indicator variable
GL_GTPO_GNULIB_VFPRINTF to 0.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 93f24054e514dbf13a3edca80a116d38fc2de4c3..e7eae13bbda3bd82f521c8cac9e98e32a8ff88f1 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-2010, 2012-2015, 2018-2020 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2010, 2012-2015, 2018-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
@@ -141,7 +141,7 @@ AC_SUBST([INTL_EXPORTS_FLAGS])
 dnl Put some default definitions into config.h.
 AH_BOTTOM([
 /* On Windows, variables that may be in a DLL must be marked specially.  */
-#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
+#if (defined _MSC_VER && defined WOE32DLL) && !defined IN_RELOCWRAPPER
 # define DLL_VARIABLE __declspec (dllimport)
 #else
 # define DLL_VARIABLE

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 3152306df10cc58e0a55595210fd6c8da2d2e379..f439f5e9ad2f4dfdf1e54ae48919655a18b17e19 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -212,12 +212,13 @@ 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.
+dnl fprintf, vfprintf.
 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
+GL_GTPO_GNULIB_VFPRINTF=0
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([pwd.h])