tests: Fix potential link errors.

* modules/mbiter-bench-tests (Makefile.am): Link the benchmark program
with $(LIBICONV).
* modules/mbiterf-bench-tests (Makefile.am): Likewise.
* modules/mbuiter-bench-tests (Makefile.am): Likewise.
* modules/mbuiterf-bench-tests (Makefile.am): Likewise.
* modules/mcel-bench-tests (Makefile.am): Likewise.
* modules/mbswidth-bench-tests (Makefile.am): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ebf3d3946badccf94989297bb83120b7f39e9961..b84aa6a86d8d0d83da31564b3d370be578fb69e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2025-09-02  Bruno Haible  <bruno@clisp.org>
+
+       tests: Fix potential link errors.
+       * modules/mbiter-bench-tests (Makefile.am): Link the benchmark program
+       with $(LIBICONV).
+       * modules/mbiterf-bench-tests (Makefile.am): Likewise.
+       * modules/mbuiter-bench-tests (Makefile.am): Likewise.
+       * modules/mbuiterf-bench-tests (Makefile.am): Likewise.
+       * modules/mcel-bench-tests (Makefile.am): Likewise.
+       * modules/mbswidth-bench-tests (Makefile.am): Likewise.
+
 2025-09-02  Bruno Haible  <bruno@clisp.org>
 
        Clarify link dependency towards libiconv.

diff --git a/modules/mbiter-bench-tests b/modules/mbiter-bench-tests
index 03ca0774703197cf36b7e2d6a59f008b8743c510..ec22673d1a0b3f222a9ec7618cfd8d4fb1fb7970 100644 (file)
--- a/modules/mbiter-bench-tests
+++ b/modules/mbiter-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbiter
 bench_mbiter_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)

diff --git a/modules/mbiterf-bench-tests b/modules/mbiterf-bench-tests
index 52106aad339e3ccc92181a9877df14b4e31efc0c..b4b530dc5a4f564af29a58eb0ded84e2f3b5f95a 100644 (file)
--- a/modules/mbiterf-bench-tests
+++ b/modules/mbiterf-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbiterf
 bench_mbiterf_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)

diff --git a/modules/mbswidth-bench-tests b/modules/mbswidth-bench-tests
index 2f3e449e99b1002d6b06d108728a91afd8c3d0e9..f8edf91dfe7c666decde6f3cbdd79a35ebcb80af 100644 (file)
--- a/modules/mbswidth-bench-tests
+++ b/modules/mbswidth-bench-tests
@@ -19,4 +19,4 @@ noinst_PROGRAMS += bench-mbswidth
 # global CPPFLAGS. For complete removal of assert() invocations, pass
 # CPPFLAGS="-DNDEBUG" when configuring the package.
 bench_mbswidth_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbswidth_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbswidth_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)

diff --git a/modules/mbuiter-bench-tests b/modules/mbuiter-bench-tests
index ad2d0169df694df7bf750e41552292494b40bd84..de98778fd6c9cbfac40b765e5f7077f4b03e2080 100644 (file)
--- a/modules/mbuiter-bench-tests
+++ b/modules/mbuiter-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbuiter
 bench_mbuiter_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbuiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbuiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)

diff --git a/modules/mbuiterf-bench-tests b/modules/mbuiterf-bench-tests
index d29e19edb5a6427aa39a914a0704bb76df5407ce..cf806ecc49fd3c614308fc5be4fc24a187215f82 100644 (file)
--- a/modules/mbuiterf-bench-tests
+++ b/modules/mbuiterf-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbuiterf
 bench_mbuiterf_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbuiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbuiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)

diff --git a/modules/mcel-bench-tests b/modules/mcel-bench-tests
index ea64a2f60cdc4201af1aac54ef501000efffee87..0c54aad819e861e63ae481372c9ca805cc177c18 100644 (file)
--- a/modules/mcel-bench-tests
+++ b/modules/mcel-bench-tests
@@ -20,4 +20,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mcel
 bench_mcel_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mcel_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mcel_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)