From: Bruno Haible Date: Thu, 27 Jul 2023 18:52:36 +0000 (+0200) Subject: fnmatch, glob tests: Fix link errors (regression 2023-07-24). X-Git-Tag: v1.0~1023 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d0dcfa5cf9fb2e42c925e2d92289dd51f0cc8639;p=gnulib.git fnmatch, glob tests: Fix link errors (regression 2023-07-24). * modules/fnmatch-tests (Makefile.am): Link test-fnmatch-w32 with the same libraries as test-fnmatch. * modules/glob (Link): Add $(LIBUNISTRING). * modules/glob-tests (Makefile.am): Link test-glob with $(LIBUNISTRING). --- diff --git a/ChangeLog b/ChangeLog index f7e4613937..ee5814a900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-07-27 Bruno Haible + + fnmatch, glob tests: Fix link errors (regression 2023-07-24). + * modules/fnmatch-tests (Makefile.am): Link test-fnmatch-w32 with the + same libraries as test-fnmatch. + * modules/glob (Link): Add $(LIBUNISTRING). + * modules/glob-tests (Makefile.am): Link test-glob with $(LIBUNISTRING). + 2023-07-26 Bruno Haible wctrans: Work around bug on NetBSD. diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests index 2d66f6f361..30ec4fded6 100644 --- a/modules/fnmatch-tests +++ b/modules/fnmatch-tests @@ -46,3 +46,4 @@ TESTS_ENVIRONMENT += \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-fnmatch test-fnmatch-w32 test_fnmatch_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) $(MBRTOWC_LIB) +test_fnmatch_w32_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) $(MBRTOWC_LIB) diff --git a/modules/glob b/modules/glob index a03834a619..7d1fea1d5d 100644 --- a/modules/glob +++ b/modules/glob @@ -59,6 +59,7 @@ Include: Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(MBRTOWC_LIB) License: diff --git a/modules/glob-tests b/modules/glob-tests index 2abbba3da6..6054e7838b 100644 --- a/modules/glob-tests +++ b/modules/glob-tests @@ -12,7 +12,7 @@ configure.ac: Makefile.am: TESTS += test-glob check_PROGRAMS += test-glob -test_glob_LDADD = $(LDADD) $(LIBINTL) $(MBRTOWC_LIB) +test_glob_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(MBRTOWC_LIB) MOSTLYCLEANFILES += \ test-glob.tglobfile \ test-glob.tgloblink1 \