From: Bruno Haible <bruno@clisp.org>
Date: Sun, 5 Jan 2020 19:15:46 +0000 (+0100)
Subject: build: Fix build error on MSVC with --disable-shared.
X-Git-Tag: v0.20.2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f51edef5d3b514bdc891d4a73ed812cd30312666;p=thirdparty%2Fgettext.git

build: Fix build error on MSVC with --disable-shared.

* gettext-tools/configure.ac (AH_BOTTOM): On MSVC with --disable-shared, even
when compiling with option -MD, define DLL_VARIABLE to empty.
---

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index d58b86ed2..925dbf799 100644
--- 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-2019 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2020 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
@@ -330,7 +330,7 @@ AH_BOTTOM([
 #define PAGE_WIDTH 79
 
 /* On Windows, variables that may be in a DLL must be marked specially.  */
-#if ((defined _MSC_VER && defined _DLL) || defined WOE32DLL) && !defined IN_RELOCWRAPPER
+#if defined WOE32DLL && !defined IN_RELOCWRAPPER
 # define DLL_VARIABLE __declspec (dllimport)
 #else
 # define DLL_VARIABLE