On Solaris, with libunistring installed, a testdir (that includes module
'libunistring-optional' in particular) exhibits a couple of link errors:
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-exclude
test-exclude.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a /home/haible/prefix-x86_64/lib/libintl.so
/home/haible/prefix-x86_64/lib/libiconv.so -R/home/haible/prefix-x86_64/lib
-lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:15556: test-exclude] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbmemcasecmp
test-mbmemcasecmp.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16810: test-mbmemcasecmp] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbscasecmp
test-mbscasecmp.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16834: test-mbscasecmp] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbscasestr1
test-mbscasestr1.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16838: test-mbscasestr1] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbscasestr2
test-mbscasestr2.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16842: test-mbscasestr2] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbscasestr3
test-mbscasestr3.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16846: test-mbscasestr3] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbscasestr4
test-mbscasestr4.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16850: test-mbscasestr4] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbschr
test-mbschr.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16854: test-mbschr] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbscspn
test-mbscspn.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16858: test-mbscspn] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbsncasecmp
test-mbsncasecmp.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16866: test-mbsncasecmp] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbspbrk
test-mbspbrk.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16878: test-mbspbrk] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbspcasecmp
test-mbspcasecmp.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16882: test-mbspcasecmp] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbsrchr
test-mbsrchr.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16886: test-mbsrchr] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbsspn
test-mbsspn.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16898: test-mbsspn] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbsstr1
test-mbsstr1.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16902: test-mbsstr1] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbsstr2
test-mbsstr2.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16906: test-mbsstr2] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-mbsstr3
test-mbsstr3.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:16910: test-mbsstr3] Error 1
gcc -m64 -O2 -g -O2 -L/home/haible/prefix-x86_64/lib -o test-regex-quote
test-regex-quote.o libtests.a ../gllib/libgnu.a libtests.a ../gllib/libgnu.a
libtests.a /home/haible/prefix-x86_64/lib/libintl.so
/home/haible/prefix-x86_64/lib/libiconv.so -R/home/haible/prefix-x86_64/lib
-lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm
Undefined first referenced
symbol in file
uc_width ../gllib/libgnu.a(wcwidth.o)
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[2]: *** [Makefile:18018: test-regex-quote] Error 1
The reason is that the autoconf macros found that uc_width is present in
libunistring, and therefore no need to generate the .o file that would
contain it as well. But the link command line must reference libunistring...
This patch fixes it.
2021-01-03 Bruno Haible <br...@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.
diff --git a/modules/exclude b/modules/exclude
index 8fe2708..2529027 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 f8372a3..762c18c 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 1a79abc..b1fa0fa 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 ae7704b..df16997 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 0f08040..4b36756 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 1af2b1c..79953d7 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 69c1d0e..fea2084 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 6c4249c..b02b288 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 6894553..7123e52 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 8c12c8d..b636b48 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 0def3bf..556c590 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 dd55613..387a67b 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 85e30f6..e7bccb0 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 95cc670..288e39d 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 effac53..64253e4 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 41a2531..b4f4851 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 5dc287d..10b887b 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 a18fc3b..8b3aa79 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 0d4ad37..3064b57 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 5a167f3..9620e3f 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 bb001fe..a0a66ca 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 f581f82..da304ce 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 b6b0e2d..d1ee204 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 6f272e0..9c42a5c 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 d104196..13e29df 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 7e3726d..11c00bf 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 8d63084..b914436 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 af17401..9f7904c 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 5458607..8547e09 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 697aaf8..8be507d 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 ad518bb..dc0429e 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 736d902..287584d 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 78af61d..25d1d9f 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 e753ee7..ab06a46 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 4623339..9ffa6ae 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 aa99cd0..64e4460 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 3d29e3a..23df06c 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 be9552a..022834b 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 372c210..2a74415 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+
