From be8efac78d067c138ad8dda03df4336e73f94887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sat, 8 Jan 2022 11:51:07 +0100
Subject: New upstream version 1.0

---
 m4/woe32-dll.m4 | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'm4/woe32-dll.m4')

diff --git a/m4/woe32-dll.m4 b/m4/woe32-dll.m4
index a25f5acb..8a14c2cd 100644
--- a/m4/woe32-dll.m4
+++ b/m4/woe32-dll.m4
@@ -1,5 +1,5 @@
-# woe32-dll.m4 serial 3
-dnl Copyright (C) 2005-2006, 2011, 2015-2016 Free Software Foundation, Inc.
+# woe32-dll.m4 serial 6
+dnl Copyright (C) 2005-2006, 2011, 2018, 2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,19 +25,31 @@ dnl From Bruno Haible.
 #     exported struct variable, or to a particular element of an exported
 #     array variable), requiring code modifications.  One platform
 #     dictates code modifications on all platforms.
-# See <http://www.haible.de/bruno/woe32dll.html> for more details.
+# See <https://haible.de/bruno/woe32dll.html> for more details.
 AC_DEFUN([gl_WOE32_DLL],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
     mingw* | cygwin*)
-      AC_MSG_CHECKING([for auto-import of symbols])
-      AC_CACHE_VAL([gl_cv_ld_autoimport], [
-        gl_save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
-        AC_TRY_LINK([], [], [gl_cv_ld_autoimport=yes], [gl_cv_ld_autoimport=no])
-        LDFLAGS="$gl_save_LDFLAGS"])
-      AC_MSG_RESULT([$gl_cv_ld_autoimport])
+      AC_CACHE_CHECK([for auto-import of symbols],
+        [gl_cv_ld_autoimport],
+        [dnl --disable-auto-import is unsupported in MSVC and in MSVC/clang.
+         dnl We need to sort out this case explicitly, because with clang,
+         dnl -Wl,--disable-auto-import does not yield an error, however later
+         dnl libtool turns it into --disable-auto-import, which does produce
+         dnl an error.
+         AC_EGREP_CPP([Known], [
+            #ifdef _MSC_VER
+             Known
+            #endif
+           ],
+           [gl_cv_ld_autoimport=no],
+           [gl_save_LDFLAGS="$LDFLAGS"
+            LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
+            AC_LINK_IFELSE([], [gl_cv_ld_autoimport=yes], [gl_cv_ld_autoimport=no])
+            LDFLAGS="$gl_save_LDFLAGS"
+           ])
+        ])
       if test $gl_cv_ld_autoimport = yes; then
         LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
       fi
-- 
cgit v1.2.3