From: Bruno Haible <bruno@clisp.org>
Date: Sat, 25 Apr 2026 09:26:37 +0000 (+0200)
Subject: regex: Fix link error on macOS and FreeBSD (regression yesterday).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2fb3d721a7dc65bee6ddc887ccb0d1bdd7291e2;p=thirdparty%2Fgnulib.git

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 a69fff73dd..dd2156cde9 100644
--- 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 9cb277618b..d3e3ad326d 100644
--- 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 79a0ec04f6..1eea754c5c 100644
--- 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)