From 40aa5e037f6ba171c14900a8c7ffaf541f221698 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 4 Jan 2021 03:48:24 +0100
Subject: [PATCH] tests: Fix link errors on Solaris, when libunistring-optional
 is in use.

* modules/wcwidth (Link): New section.
* modules/wcswidth (Link): New section.
* modules/mbchar (Link): New section.
* modules/mbfile (Link): Link against libunistring.
* modules/mbiter (Link): Likewise.
* modules/mbuiter (Link): Likewise.
* modules/mbmemcasecmp (Link): Likewise.
* modules/mbscasecmp (Link): Likewise.
* modules/mbscasestr (Link): Likewise.
* modules/mbschr (Link): Likewise.
* modules/mbscspn (Link): Likewise.
* modules/mbslen (Link): Likewise.
* modules/mbsncasecmp (Link): Likewise.
* modules/mbsnlen (Link): Likewise.
* modules/mbspbrk (Link): Likewise.
* modules/mbspcasecmp (Link): Likewise.
* modules/mbsrchr (Link): Likewise.
* modules/mbssep (Link): Likewise.
* modules/mbsspn (Link): Likewise.
* modules/mbsstr (Link): Likewise.
* modules/mbstok_r (Link): Likewise.
* modules/mbswidth (Link): Likewise.
* modules/exclude (Link): Likewise.
* modules/propername (Link): Likewise.
* modules/regex-quote (Link): Likewise.
* modules/trim (Link): Likewise.
* modules/mbmemcasecmp-tests (Makefile.am): Link the test program
against libunistring.
* modules/mbscasecmp-tests (Makefile.am): Likewise.
* modules/mbscasestr-tests (Makefile.am): Likewise.
* modules/mbschr-tests (Makefile.am): Likewise.
* modules/mbscspn-tests (Makefile.am): Likewise.
* modules/mbsncasecmp-tests (Makefile.am): Likewise.
* modules/mbspbrk-tests (Makefile.am): Likewise.
* modules/mbspcasecmp-tests (Makefile.am): Likewise.
* modules/mbsrchr-tests (Makefile.am): Likewise.
* modules/mbsspn-tests (Makefile.am): Likewise.
* modules/mbsstr-tests (Makefile.am): Likewise.
* modules/exclude-tests (Makefile.am): Likewise.
* modules/regex-quote-tests (Makefile.am): Likewise.
---
 ChangeLog                  | 44 ++++++++++++++++++++++++++++++++++++++
 modules/exclude            |  1 +
 modules/exclude-tests      |  2 +-
 modules/mbchar             |  3 +++
 modules/mbfile             |  1 +
 modules/mbiter             |  1 +
 modules/mbmemcasecmp       |  1 +
 modules/mbmemcasecmp-tests |  2 +-
 modules/mbscasecmp         |  1 +
 modules/mbscasecmp-tests   |  2 +-
 modules/mbscasestr         |  1 +
 modules/mbscasestr-tests   |  8 +++----
 modules/mbschr             |  1 +
 modules/mbschr-tests       |  2 +-
 modules/mbscspn            |  1 +
 modules/mbscspn-tests      |  2 +-
 modules/mbslen             |  1 +
 modules/mbsncasecmp        |  1 +
 modules/mbsncasecmp-tests  |  2 +-
 modules/mbsnlen            |  1 +
 modules/mbspbrk            |  1 +
 modules/mbspbrk-tests      |  2 +-
 modules/mbspcasecmp        |  1 +
 modules/mbspcasecmp-tests  |  2 +-
 modules/mbsrchr            |  1 +
 modules/mbsrchr-tests      |  2 +-
 modules/mbssep             |  1 +
 modules/mbsspn             |  1 +
 modules/mbsspn-tests       |  2 +-
 modules/mbsstr             |  1 +
 modules/mbsstr-tests       |  6 +++---
 modules/mbstok_r           |  1 +
 modules/mbswidth           |  1 +
 modules/mbuiter            |  1 +
 modules/propername         |  1 +
 modules/regex-quote        |  1 +
 modules/regex-quote-tests  |  2 +-
 modules/trim               |  1 +
 modules/wcswidth           |  3 +++
 modules/wcwidth            |  3 +++
 40 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d1a13aed2..4eec2938ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2021-01-03  Bruno Haible  <bruno@clisp.org>
+
+	tests: Fix link errors on Solaris, when libunistring-optional is in use.
+	* modules/wcwidth (Link): New section.
+	* modules/wcswidth (Link): New section.
+	* modules/mbchar (Link): New section.
+	* modules/mbfile (Link): Link against libunistring.
+	* modules/mbiter (Link): Likewise.
+	* modules/mbuiter (Link): Likewise.
+	* modules/mbmemcasecmp (Link): Likewise.
+	* modules/mbscasecmp (Link): Likewise.
+	* modules/mbscasestr (Link): Likewise.
+	* modules/mbschr (Link): Likewise.
+	* modules/mbscspn (Link): Likewise.
+	* modules/mbslen (Link): Likewise.
+	* modules/mbsncasecmp (Link): Likewise.
+	* modules/mbsnlen (Link): Likewise.
+	* modules/mbspbrk (Link): Likewise.
+	* modules/mbspcasecmp (Link): Likewise.
+	* modules/mbsrchr (Link): Likewise.
+	* modules/mbssep (Link): Likewise.
+	* modules/mbsspn (Link): Likewise.
+	* modules/mbsstr (Link): Likewise.
+	* modules/mbstok_r (Link): Likewise.
+	* modules/mbswidth (Link): Likewise.
+	* modules/exclude (Link): Likewise.
+	* modules/propername (Link): Likewise.
+	* modules/regex-quote (Link): Likewise.
+	* modules/trim (Link): Likewise.
+	* modules/mbmemcasecmp-tests (Makefile.am): Link the test program
+	against libunistring.
+	* modules/mbscasecmp-tests (Makefile.am): Likewise.
+	* modules/mbscasestr-tests (Makefile.am): Likewise.
+	* modules/mbschr-tests (Makefile.am): Likewise.
+	* modules/mbscspn-tests (Makefile.am): Likewise.
+	* modules/mbsncasecmp-tests (Makefile.am): Likewise.
+	* modules/mbspbrk-tests (Makefile.am): Likewise.
+	* modules/mbspcasecmp-tests (Makefile.am): Likewise.
+	* modules/mbsrchr-tests (Makefile.am): Likewise.
+	* modules/mbsspn-tests (Makefile.am): Likewise.
+	* modules/mbsstr-tests (Makefile.am): Likewise.
+	* modules/exclude-tests (Makefile.am): Likewise.
+	* modules/regex-quote-tests (Makefile.am): Likewise.
+
 2021-01-03  Bruno Haible  <bruno@clisp.org>
 
 	c32ispunct tests: Avoid test failures on FreeBSD.
diff --git a/modules/exclude b/modules/exclude
index 8fe2708b99..2529027218 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -26,6 +26,7 @@ Include:
 "exclude.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/exclude-tests b/modules/exclude-tests
index f8372a3efb..762c18ce4b 100644
--- a/modules/exclude-tests
+++ b/modules/exclude-tests
@@ -26,4 +26,4 @@ TESTS += \
  test-exclude8.sh
 
 check_PROGRAMS += test-exclude
-test_exclude_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) $(LIBTHREAD)
+test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(LIB_MBRTOWC) $(LIBTHREAD)
diff --git a/modules/mbchar b/modules/mbchar
index 1a79abce92..b1fa0fa4ac 100644
--- a/modules/mbchar
+++ b/modules/mbchar
@@ -27,6 +27,9 @@ lib_SOURCES += mbchar.c
 Include:
 "mbchar.h"
 
+Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/mbfile b/modules/mbfile
index ae7704b88e..df169979a4 100644
--- a/modules/mbfile
+++ b/modules/mbfile
@@ -25,6 +25,7 @@ Include:
 "mbfile.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbiter b/modules/mbiter
index 0f08040e7d..4b36756c25 100644
--- a/modules/mbiter
+++ b/modules/mbiter
@@ -25,6 +25,7 @@ Include:
 "mbiter.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbmemcasecmp b/modules/mbmemcasecmp
index 1af2b1cad5..79953d79b3 100644
--- a/modules/mbmemcasecmp
+++ b/modules/mbmemcasecmp
@@ -17,6 +17,7 @@ Include:
 "mbmemcasecmp.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index 69c1d0e17d..fea2084612 100644
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbmemcasecmp
-test_mbmemcasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbscasecmp b/modules/mbscasecmp
index 6c4249c88d..b02b28830b 100644
--- a/modules/mbscasecmp
+++ b/modules/mbscasecmp
@@ -18,6 +18,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index 6894553a5e..7123e521e5 100644
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbscasecmp.sh
 TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbscasecmp
-test_mbscasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbscasestr b/modules/mbscasestr
index 8c12c8d3b5..b636b4802e 100644
--- a/modules/mbscasestr
+++ b/modules/mbscasestr
@@ -23,6 +23,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 0def3bf97b..556c5903f3 100644
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -24,7 +24,7 @@ Makefile.am:
 TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
-test_mbscasestr1_LDADD = $(LDADD) $(LIB_MBRTOWC)
-test_mbscasestr2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
-test_mbscasestr3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
-test_mbscasestr4_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
+test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbschr b/modules/mbschr
index dd55613e4b..387a67b775 100644
--- a/modules/mbschr
+++ b/modules/mbschr
@@ -18,6 +18,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index 85e30f6571..e7bccb0192 100644
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbschr.sh
 TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbschr
-test_mbschr_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbscspn b/modules/mbscspn
index 95cc670d28..288e39db49 100644
--- a/modules/mbscspn
+++ b/modules/mbscspn
@@ -20,6 +20,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index effac53d16..64253e43fd 100644
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbscspn.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbscspn
-test_mbscspn_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbslen b/modules/mbslen
index 41a2531ffb..b4f4851e7f 100644
--- a/modules/mbslen
+++ b/modules/mbslen
@@ -20,6 +20,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp
index 5dc287ddaa..10b887b8f9 100644
--- a/modules/mbsncasecmp
+++ b/modules/mbsncasecmp
@@ -18,6 +18,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index a18fc3b271..8b3aa79afa 100644
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbsncasecmp.sh
 TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbsncasecmp
-test_mbsncasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbsnlen b/modules/mbsnlen
index 0d4ad37fe1..3064b57974 100644
--- a/modules/mbsnlen
+++ b/modules/mbsnlen
@@ -18,6 +18,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbspbrk b/modules/mbspbrk
index 5a167f3207..9620e3f0f3 100644
--- a/modules/mbspbrk
+++ b/modules/mbspbrk
@@ -20,6 +20,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index bb001fe88d..a0a66ca8dc 100644
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbspbrk.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbspbrk
-test_mbspbrk_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp
index f581f82a81..da304ce71e 100644
--- a/modules/mbspcasecmp
+++ b/modules/mbspcasecmp
@@ -18,6 +18,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index b6b0e2d82c..d1ee204d87 100644
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbspcasecmp.sh
 TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbspcasecmp
-test_mbspcasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbsrchr b/modules/mbsrchr
index 6f272e0d44..9c42a5c163 100644
--- a/modules/mbsrchr
+++ b/modules/mbsrchr
@@ -18,6 +18,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index d104196256..13e29dfc21 100644
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbsrchr.sh
 TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsrchr
-test_mbsrchr_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbssep b/modules/mbssep
index 7e3726dbef..11c00bf1ca 100644
--- a/modules/mbssep
+++ b/modules/mbssep
@@ -20,6 +20,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbsspn b/modules/mbsspn
index 8d63084086..b9144364f6 100644
--- a/modules/mbsspn
+++ b/modules/mbsspn
@@ -19,6 +19,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index af1740144d..9f7904cd4b 100644
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbsspn.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbsspn
-test_mbsspn_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbsstr b/modules/mbsstr
index 5458607a2b..8547e0971e 100644
--- a/modules/mbsstr
+++ b/modules/mbsstr
@@ -23,6 +23,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index 697aaf829a..8be507d539 100644
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -20,6 +20,6 @@ Makefile.am:
 TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
-test_mbsstr1_LDADD = $(LDADD) $(LIB_MBRTOWC)
-test_mbsstr2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
-test_mbsstr3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
+test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
diff --git a/modules/mbstok_r b/modules/mbstok_r
index ad518bb6a5..dc0429e7cf 100644
--- a/modules/mbstok_r
+++ b/modules/mbstok_r
@@ -21,6 +21,7 @@ Include:
 <string.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbswidth b/modules/mbswidth
index 736d9021da..287584d60b 100644
--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -26,6 +26,7 @@ Include:
 "mbswidth.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/mbuiter b/modules/mbuiter
index 78af61dcae..25d1d9fc78 100644
--- a/modules/mbuiter
+++ b/modules/mbuiter
@@ -26,6 +26,7 @@ Include:
 "mbuiter.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/propername b/modules/propername
index e753ee7d90..ab06a46cd3 100644
--- a/modules/propername
+++ b/modules/propername
@@ -36,6 +36,7 @@ Include:
 "propername.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/regex-quote b/modules/regex-quote
index 4623339c3d..9ffa6aec60 100644
--- a/modules/regex-quote
+++ b/modules/regex-quote
@@ -20,6 +20,7 @@ Include:
 "regex-quote.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/regex-quote-tests b/modules/regex-quote-tests
index aa99cd096e..64e4460d1d 100644
--- a/modules/regex-quote-tests
+++ b/modules/regex-quote-tests
@@ -11,4 +11,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-regex-quote
 check_PROGRAMS += test-regex-quote
-test_regex_quote_LDADD = $(LDADD) $(LIBINTL) $(LIB_MBRTOWC) $(LIBTHREAD)
+test_regex_quote_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_MBRTOWC) $(LIBTHREAD)
diff --git a/modules/trim b/modules/trim
index 3d29e3a75d..23df06cd74 100644
--- a/modules/trim
+++ b/modules/trim
@@ -21,6 +21,7 @@ Include:
 "trim.h"
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(LIB_MBRTOWC)
 
 License:
diff --git a/modules/wcswidth b/modules/wcswidth
index be9552ad74..022834b279 100644
--- a/modules/wcswidth
+++ b/modules/wcswidth
@@ -23,6 +23,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
+
 License:
 LGPL
 
diff --git a/modules/wcwidth b/modules/wcwidth
index 372c21041a..2a74415457 100644
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -28,6 +28,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
+
 License:
 LGPLv2+
 
-- 
2.39.5