diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-09-13 01:28:06 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-10-09 09:30:42 +0200 |
| commit | d74f4d4e55736840f455f63e48661f457a22191c (patch) | |
| tree | bc23fec19d65f69775b72760f4c343eb5c3326df | |
| parent | 53c26c57c5c48f4aabc2ce29129053665945b057 (diff) | |
| download | gettext-d74f4d4e55736840f455f63e48661f457a22191c.tar.gz | |
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.
| -rw-r--r-- | gettext-runtime/configure.ac | 4 | ||||
| -rw-r--r-- | gettext-tools/configure.ac | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 93f24054e..e7eae13bb 100644 --- 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 3152306df..f439f5e9a 100644 --- 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]) |