unictype/base, uninorm/base, etc.: Support shared libraries on MSVC.

* m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE_WITH_VARIABLE): Use
the value of
${module_indicator_prefix}_GNULIB_LIBUNISTRING_DLL_VARIABLE_NAME.

diff --git a/ChangeLog b/ChangeLog
index df01b3c948f44fdaff38ee5d7d3036610341bc8a..2fdc7fb4c021c3bd64491b221e454d13bc05928b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-06-05  Bruno Haible  <bruno@clisp.org>
+
+       unictype/base, uninorm/base, etc.: Support shared libraries on MSVC.
+       * m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE_WITH_VARIABLE): Use
+       the value of
+       ${module_indicator_prefix}_GNULIB_LIBUNISTRING_DLL_VARIABLE_NAME.
+
 2025-06-04  Bruno Haible  <bruno@clisp.org>
 
        test-xfail: Relicense more permissively.

diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4
index e1363442927264e96a9e004fec7385d7e76123fc..9b5795ed5517d0795af50a6c4cf278f0ac935676 100644 (file)
--- a/m4/libunistring-base.m4
+++ b/m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4
-# serial 9
+# serial 10
 dnl Copyright (C) 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,8 +41,10 @@ dnl     (This is necessary because this token must be present in the .h files
 dnl     when the .h files get installed.)
 dnl   - When building gnulib or application code it expands to
 dnl       - LIBUNISTRING_DLL_VARIABLE by default,
-dnl       - empty if the automake conditional LIBUNISTRING_COMPILE_$MODULE
-dnl         evaluates to true.
+dnl       - if the automake conditional LIBUNISTRING_COMPILE_$MODULE evaluates
+dnl         to true: the value of
+dnl         ${module_indicator_prefix}_GNULIB_LIBUNISTRING_DLL_VARIABLE_NAME
+dnl         (which usually is empty, unless explicitly set in configure.ac).
 dnl     (This is necessary because when the conditional evaluates to false,
 dnl     the application code expects to use the declared variable from the
 dnl     installed libunistring; it's in this case that the
@@ -56,7 +58,7 @@ AC_DEFUN([gl_LIBUNISTRING_MODULE_WITH_VARIABLE],
   gl_LIBUNISTRING_MODULE([$1], [$2])
   m4_ifndef([gl_IN_LIBUNISTRING],
     [if test -z "${AS_TR_CPP([LIBUNISTRING_COMPILE_$2])_TRUE}"; then
-       GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]AS_TR_CPP([$2_DLL_VARIABLE])=
+       GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]AS_TR_CPP([$2_DLL_VARIABLE])=$GL_MODULE_INDICATOR_PREFIX[]_GNULIB_LIBUNISTRING_DLL_VARIABLE_NAME
      fi
     ])
 ])