From a4d8a7a984237d69c7ee83a7a8b2b788f4ecb3ee Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 22 Mar 2023 14:42:58 +0100 Subject: [PATCH] vasnwprintf tests: Fix link errors on AIX. * modules/vasnwprintf (Link): New section. * modules/vasnwprintf-posix (Link): New section. * modules/vasnwprintf-tests (Makefile.am): Link test-vasnwprintf with $(MBRTOWC_LIB). * modules/vasnwprintf-posix-tests (Makefile.am): Link test-vasnwprintf-posix, test-vasnwprintf-posix2, test-vasnwprintf-posix3 with $(MBRTOWC_LIB). --- ChangeLog | 11 +++++++++++ modules/vasnwprintf | 3 +++ modules/vasnwprintf-posix | 3 +++ modules/vasnwprintf-posix-tests | 5 +++-- modules/vasnwprintf-tests | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b9a048b93..568db7a8da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-03-22 Bruno Haible + + vasnwprintf tests: Fix link errors on AIX. + * modules/vasnwprintf (Link): New section. + * modules/vasnwprintf-posix (Link): New section. + * modules/vasnwprintf-tests (Makefile.am): Link test-vasnwprintf with + $(MBRTOWC_LIB). + * modules/vasnwprintf-posix-tests (Makefile.am): Link + test-vasnwprintf-posix, test-vasnwprintf-posix2, test-vasnwprintf-posix3 + with $(MBRTOWC_LIB). + 2023-03-22 Bruno Haible gnu-web-doc-update: Make it work for the first upload of a manual. diff --git a/modules/vasnwprintf b/modules/vasnwprintf index 91c4ca64ed..82eb83675f 100644 --- a/modules/vasnwprintf +++ b/modules/vasnwprintf @@ -50,6 +50,9 @@ lib_SOURCES += asnwprintf.c Include: "vasnwprintf.h" +Link: +$(MBRTOWC_LIB) + License: LGPLv2+ diff --git a/modules/vasnwprintf-posix b/modules/vasnwprintf-posix index ca14e64866..554efe1707 100644 --- a/modules/vasnwprintf-posix +++ b/modules/vasnwprintf-posix @@ -35,6 +35,9 @@ Makefile.am: Include: "vasnwprintf.h" +Link: +$(MBRTOWC_LIB) + License: LGPLv2+ diff --git a/modules/vasnwprintf-posix-tests b/modules/vasnwprintf-posix-tests index d9729e9dcb..667eb61103 100644 --- a/modules/vasnwprintf-posix-tests +++ b/modules/vasnwprintf-posix-tests @@ -28,5 +28,6 @@ Makefile.am: TESTS += test-vasnwprintf-posix test-vasnwprintf-posix2.sh test-vasnwprintf-posix3 TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-vasnwprintf-posix test-vasnwprintf-posix2 test-vasnwprintf-posix3 -test_vasnwprintf_posix2_LDADD = $(LDADD) $(SETLOCALE_LIB) -test_vasnwprintf_posix3_LDADD = $(LDADD) $(SETLOCALE_LIB) +test_vasnwprintf_posix_LDADD = $(LDADD) $(MBRTOWC_LIB) +test_vasnwprintf_posix2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) +test_vasnwprintf_posix3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/vasnwprintf-tests b/modules/vasnwprintf-tests index 37ed08de56..5eb8a67d0c 100644 --- a/modules/vasnwprintf-tests +++ b/modules/vasnwprintf-tests @@ -12,3 +12,4 @@ configure.ac: Makefile.am: TESTS += test-vasnwprintf check_PROGRAMS += test-vasnwprintf +test_vasnwprintf_LDADD = $(LDADD) $(MBRTOWC_LIB) -- 2.39.5