regex: Fix link error on macOS and FreeBSD (regression yesterday).

* modules/regex (Link): Add $(LIBUNISTRING), $(LIBC32CONV).
* modules/regex-tests (Makefile.am): Link test-regex with
$(LIBUNISTRING) and $(LIBC32CONV).

diff --git a/ChangeLog b/ChangeLog
index a69fff73ddb0a0249c073e05f38e3377fd2001bd..dd2156cde9a176fa937a3acec27366a69e3f06dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2026-04-25  Bruno Haible  <bruno@clisp.org>
+
+       regex: Fix link error on macOS and FreeBSD (regression yesterday).
+       * modules/regex (Link): Add $(LIBUNISTRING), $(LIBC32CONV).
+       * modules/regex-tests (Makefile.am): Link test-regex with
+       $(LIBUNISTRING) and $(LIBC32CONV).
+
 2026-04-25  Bruno Haible  <bruno@clisp.org>
 
        uchar-h tests: Strengthen tests.

diff --git a/modules/regex b/modules/regex
index 9cb277618b6820acaa84d987bf78886893ffe7e8..d3e3ad326d1d5751b3ad409c53cf7bd2da5e276b 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -70,7 +70,9 @@ Include:
 <regex.h>
 
 Link:
+$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
+$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
 $(LIBTHREAD)
 $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 

diff --git a/modules/regex-tests b/modules/regex-tests
index 79a0ec04f657055bb97fb0452451be3493a766a9..1eea754c5caaf3a8fe538e8de3984cb2c065aee2 100644 (file)
--- a/modules/regex-tests
+++ b/modules/regex-tests
@@ -14,4 +14,4 @@ AC_CHECK_DECLS_ONCE([alarm])
 Makefile.am:
 TESTS += test-regex
 check_PROGRAMS += test-regex
-test_regex_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD)
+test_regex_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) @LIBINTL@ $(LIBC32CONV) $(LIBTHREAD)