From 16a84f2d70f804ff49e2d3ecabb28c31f5a14553 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 17 Nov 2020 02:51:29 +0100 Subject: [PATCH] Fix link errors on platforms with libunistring. * modules/c32isalnum (Link): New section. * modules/c32isalnum-tests (Makefile.am): Link test-c32isalnum with $(LIBUNISTRING). * modules/c32isalpha (Link): New section. * modules/c32isalpha-tests (Makefile.am): Link test-c32isalpha with $(LIBUNISTRING). * modules/c32isblank (Link): New section. * modules/c32isblank-tests (Makefile.am): Link test-c32isblank with $(LIBUNISTRING). * modules/c32iscntrl (Link): New section. * modules/c32iscntrl-tests (Makefile.am): Link test-c32iscntrl with $(LIBUNISTRING). * modules/c32isdigit (Link): New section. * modules/c32isdigit-tests (Makefile.am): Link test-c32isdigit with $(LIBUNISTRING). * modules/c32isgraph (Link): New section. * modules/c32isgraph-tests (Makefile.am): Link test-c32isgraph with $(LIBUNISTRING). * modules/c32islower (Link): New section. * modules/c32islower-tests (Makefile.am): Link test-c32islower with $(LIBUNISTRING). * modules/c32isprint (Link): New section. * modules/c32isprint-tests (Makefile.am): Link test-c32isprint with $(LIBUNISTRING). * modules/c32ispunct (Link): New section. * modules/c32ispunct-tests (Makefile.am): Link test-c32ispunct with $(LIBUNISTRING). * modules/c32isspace (Link): New section. * modules/c32isspace-tests (Makefile.am): Link test-c32isspace with $(LIBUNISTRING). * modules/c32isupper (Link): New section. * modules/c32isupper-tests (Makefile.am): Link test-c32isupper with $(LIBUNISTRING). * modules/c32isxdigit (Link): New section. * modules/c32isxdigit-tests (Makefile.am): Link test-c32isxdigit with $(LIBUNISTRING). * modules/unicodeio (Link): Mention $(LIBUNISTRING). * modules/unicodeio-tests (Makefile.am): Link test-unicodeio with $(LIBUNISTRING). --- ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++ modules/c32isalnum | 3 +++ modules/c32isalnum-tests | 2 +- modules/c32isalpha | 3 +++ modules/c32isalpha-tests | 2 +- modules/c32isblank | 3 +++ modules/c32isblank-tests | 2 +- modules/c32iscntrl | 3 +++ modules/c32iscntrl-tests | 2 +- modules/c32isdigit | 3 +++ modules/c32isdigit-tests | 2 +- modules/c32isgraph | 3 +++ modules/c32isgraph-tests | 2 +- modules/c32islower | 3 +++ modules/c32islower-tests | 2 +- modules/c32isprint | 3 +++ modules/c32isprint-tests | 2 +- modules/c32ispunct | 3 +++ modules/c32ispunct-tests | 2 +- modules/c32isspace | 3 +++ modules/c32isspace-tests | 2 +- modules/c32isupper | 3 +++ modules/c32isupper-tests | 2 +- modules/c32isxdigit | 3 +++ modules/c32isxdigit-tests | 2 +- modules/unicodeio | 1 + modules/unicodeio-tests | 2 +- 27 files changed, 93 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aa062804c..c8f4ffaac0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +2020-11-16 Bruno Haible + + Fix link errors on platforms with libunistring. + * modules/c32isalnum (Link): New section. + * modules/c32isalnum-tests (Makefile.am): Link test-c32isalnum with + $(LIBUNISTRING). + * modules/c32isalpha (Link): New section. + * modules/c32isalpha-tests (Makefile.am): Link test-c32isalpha with + $(LIBUNISTRING). + * modules/c32isblank (Link): New section. + * modules/c32isblank-tests (Makefile.am): Link test-c32isblank with + $(LIBUNISTRING). + * modules/c32iscntrl (Link): New section. + * modules/c32iscntrl-tests (Makefile.am): Link test-c32iscntrl with + $(LIBUNISTRING). + * modules/c32isdigit (Link): New section. + * modules/c32isdigit-tests (Makefile.am): Link test-c32isdigit with + $(LIBUNISTRING). + * modules/c32isgraph (Link): New section. + * modules/c32isgraph-tests (Makefile.am): Link test-c32isgraph with + $(LIBUNISTRING). + * modules/c32islower (Link): New section. + * modules/c32islower-tests (Makefile.am): Link test-c32islower with + $(LIBUNISTRING). + * modules/c32isprint (Link): New section. + * modules/c32isprint-tests (Makefile.am): Link test-c32isprint with + $(LIBUNISTRING). + * modules/c32ispunct (Link): New section. + * modules/c32ispunct-tests (Makefile.am): Link test-c32ispunct with + $(LIBUNISTRING). + * modules/c32isspace (Link): New section. + * modules/c32isspace-tests (Makefile.am): Link test-c32isspace with + $(LIBUNISTRING). + * modules/c32isupper (Link): New section. + * modules/c32isupper-tests (Makefile.am): Link test-c32isupper with + $(LIBUNISTRING). + * modules/c32isxdigit (Link): New section. + * modules/c32isxdigit-tests (Makefile.am): Link test-c32isxdigit with + $(LIBUNISTRING). + * modules/unicodeio (Link): Mention $(LIBUNISTRING). + * modules/unicodeio-tests (Makefile.am): Link test-unicodeio with + $(LIBUNISTRING). + 2020-11-16 Bruno Haible Fix link errors on platforms with libintl (e.g. Solaris and AIX). diff --git a/modules/c32isalnum b/modules/c32isalnum index 213ffdda72..193565552b 100644 --- a/modules/c32isalnum +++ b/modules/c32isalnum @@ -26,6 +26,9 @@ lib_SOURCES += c32isalnum.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isalnum-tests b/modules/c32isalnum-tests index 51e3ac4de6..54ef82c0dc 100644 --- a/modules/c32isalnum-tests +++ b/modules/c32isalnum-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isalnum -test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isalpha b/modules/c32isalpha index 1ca598d3e4..c4b831e4c9 100644 --- a/modules/c32isalpha +++ b/modules/c32isalpha @@ -26,6 +26,9 @@ lib_SOURCES += c32isalpha.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isalpha-tests b/modules/c32isalpha-tests index 4c4ebaa9a7..1e4c77bfbc 100644 --- a/modules/c32isalpha-tests +++ b/modules/c32isalpha-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isalpha -test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isblank b/modules/c32isblank index eff925a33c..3c99311778 100644 --- a/modules/c32isblank +++ b/modules/c32isblank @@ -27,6 +27,9 @@ lib_SOURCES += c32isblank.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isblank-tests b/modules/c32isblank-tests index 8f48be3ff4..9efdda44c7 100644 --- a/modules/c32isblank-tests +++ b/modules/c32isblank-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isblank -test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32iscntrl b/modules/c32iscntrl index 4fb648463f..74f571debe 100644 --- a/modules/c32iscntrl +++ b/modules/c32iscntrl @@ -26,6 +26,9 @@ lib_SOURCES += c32iscntrl.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32iscntrl-tests b/modules/c32iscntrl-tests index b170e7c915..d927f33f41 100644 --- a/modules/c32iscntrl-tests +++ b/modules/c32iscntrl-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32iscntrl -test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isdigit b/modules/c32isdigit index 3e31fdb36f..bb1cae5ee2 100644 --- a/modules/c32isdigit +++ b/modules/c32isdigit @@ -27,6 +27,9 @@ lib_SOURCES += c32isdigit.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isdigit-tests b/modules/c32isdigit-tests index ccb74f3c15..b300e11ca8 100644 --- a/modules/c32isdigit-tests +++ b/modules/c32isdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isdigit -test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isgraph b/modules/c32isgraph index 9c14ab043a..dd967ca8a3 100644 --- a/modules/c32isgraph +++ b/modules/c32isgraph @@ -26,6 +26,9 @@ lib_SOURCES += c32isgraph.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isgraph-tests b/modules/c32isgraph-tests index 0cb732194a..a1badde179 100644 --- a/modules/c32isgraph-tests +++ b/modules/c32isgraph-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isgraph -test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32islower b/modules/c32islower index 475f51d68c..b8949aef39 100644 --- a/modules/c32islower +++ b/modules/c32islower @@ -26,6 +26,9 @@ lib_SOURCES += c32islower.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32islower-tests b/modules/c32islower-tests index bf52816685..5a6010fdf5 100644 --- a/modules/c32islower-tests +++ b/modules/c32islower-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32islower -test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isprint b/modules/c32isprint index b95a8c5937..9badd0b6d0 100644 --- a/modules/c32isprint +++ b/modules/c32isprint @@ -26,6 +26,9 @@ lib_SOURCES += c32isprint.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isprint-tests b/modules/c32isprint-tests index ea7abd61fb..5c804f244d 100644 --- a/modules/c32isprint-tests +++ b/modules/c32isprint-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isprint -test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32ispunct b/modules/c32ispunct index 2f5e0e48d6..72373c8473 100644 --- a/modules/c32ispunct +++ b/modules/c32ispunct @@ -27,6 +27,9 @@ lib_SOURCES += c32ispunct.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32ispunct-tests b/modules/c32ispunct-tests index 2e1ee9526f..396d1ca4c0 100644 --- a/modules/c32ispunct-tests +++ b/modules/c32ispunct-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32ispunct -test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isspace b/modules/c32isspace index e42658b5da..2974e20e81 100644 --- a/modules/c32isspace +++ b/modules/c32isspace @@ -26,6 +26,9 @@ lib_SOURCES += c32isspace.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isspace-tests b/modules/c32isspace-tests index a37b528200..aef1272a75 100644 --- a/modules/c32isspace-tests +++ b/modules/c32isspace-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isspace -test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isupper b/modules/c32isupper index 05ea0f4dee..e10c58a272 100644 --- a/modules/c32isupper +++ b/modules/c32isupper @@ -26,6 +26,9 @@ lib_SOURCES += c32isupper.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isupper-tests b/modules/c32isupper-tests index 0410e9d2ba..beeb3a91ed 100644 --- a/modules/c32isupper-tests +++ b/modules/c32isupper-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isupper -test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/c32isxdigit b/modules/c32isxdigit index 4572deb04d..127155ca5a 100644 --- a/modules/c32isxdigit +++ b/modules/c32isxdigit @@ -28,6 +28,9 @@ lib_SOURCES += c32isxdigit.c Include: +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + License: LGPLv3+ or GPLv2 diff --git a/modules/c32isxdigit-tests b/modules/c32isxdigit-tests index 9b23f07115..b0860405e6 100644 --- a/modules/c32isxdigit-tests +++ b/modules/c32isxdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isxdigit -test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) diff --git a/modules/unicodeio b/modules/unicodeio index d7a3a4a95d..b1b077d76b 100644 --- a/modules/unicodeio +++ b/modules/unicodeio @@ -27,6 +27,7 @@ Include: Link: $(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise License: GPL diff --git a/modules/unicodeio-tests b/modules/unicodeio-tests index aa5803cf10..c53f26f2b5 100644 --- a/modules/unicodeio-tests +++ b/modules/unicodeio-tests @@ -18,4 +18,4 @@ gt_LOCALE_ZH_CN Makefile.am: TESTS += test-unicodeio1.sh test-unicodeio2.sh test-unicodeio3.sh check_PROGRAMS += test-unicodeio -test_unicodeio_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBICONV) $(LIBINTL) +test_unicodeio_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) $(LIBICONV) $(LIBINTL) -- 2.39.5