From: Bruno Haible <bruno@clisp.org>
Date: Fri, 6 Jun 2025 13:34:31 +0000 (+0200)
Subject: build: Fix build failure on Cygwin and mingw without preinstalled libunistring.
X-Git-Tag: v0.23.2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c73295083e54ca123e17576718ce13a48462e55;p=thirdparty%2Fgettext.git

build: Fix build failure on Cygwin and mingw without preinstalled libunistring.

* gettext-tools/configure.ac: Define DLL_VARIABLE and LIBGETTEXTSRC_DLL_VARIABLE
on Cygwin and mingw like on MSVC.
---

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 95d02303b..501c03d68 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -396,7 +396,7 @@ AH_BOTTOM([
 /* DLL_VARIABLE               is used for variables defined in libgettextlib.
    LIBGETTEXTSRC_DLL_VARIABLE is used for variables defined in libgettextsrc.
  */
-#if defined _MSC_VER && WOE32DLL && !defined IN_RELOCWRAPPER
+#if (defined _WIN32 || defined __CYGWIN__) && WOE32DLL && !defined IN_RELOCWRAPPER
 # if IN_LIBGETTEXTLIB
 #  if defined DLL_EXPORT
 #   define DLL_VARIABLE __declspec (dllexport)
@@ -406,12 +406,10 @@ AH_BOTTOM([
 # else
 #  define DLL_VARIABLE __declspec (dllimport)
 # endif
-#elif (defined _WIN32 || defined __CYGWIN__) && defined DLL_EXPORT && !defined IN_RELOCWRAPPER
-# define DLL_VARIABLE __declspec (dllimport)
 #else
 # define DLL_VARIABLE
 #endif
-#if defined _MSC_VER && WOE32DLL && !defined IN_RELOCWRAPPER
+#if (defined _WIN32 || defined __CYGWIN__) && WOE32DLL && !defined IN_RELOCWRAPPER
 # if IN_LIBGETTEXTSRC
 #  if defined DLL_EXPORT
 #   define LIBGETTEXTSRC_DLL_VARIABLE __declspec (dllexport)
@@ -421,8 +419,6 @@ AH_BOTTOM([
 # else
 #  define LIBGETTEXTSRC_DLL_VARIABLE __declspec (dllimport)
 # endif
-#elif (defined _WIN32 || defined __CYGWIN__) && defined DLL_EXPORT && !defined IN_RELOCWRAPPER
-# define LIBGETTEXTSRC_DLL_VARIABLE __declspec (dllimport)
 #else
 # define LIBGETTEXTSRC_DLL_VARIABLE
 #endif