Fix link error on platforms with GNU libiconv.

(cherry picked from commit 798f5bd54d8603e584c0e602abecdcc5ea625306)

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 29e1b43..3d5c2b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-07  Bruno Haible  <bruno@clisp.org>
+
+       Fix link error on platforms with GNU libiconv.
+       * modules/unistr/u8-strcoll-tests (Makefile): Define
+       test_u8_strcoll_LDADD.
+       * modules/unistr/u16-strcoll-tests (Makefile): Define
+       test_u16_strcoll_LDADD.
+       * modules/unistr/u32-strcoll-tests (Makefile): Define
+       test_u32_strcoll_LDADD.
+
 2010-03-06  Bruno Haible  <bruno@clisp.org>
 
        Clarify access, euidaccess, faccessat.

diff --git a/modules/unistr/u16-strcoll-tests b/modules/unistr/u16-strcoll-tests
index 84f54de..227a9df 100644 (file)
--- a/modules/unistr/u16-strcoll-tests
+++ b/modules/unistr/u16-strcoll-tests
@@ -12,3 +12,4 @@ Makefile.am:
 TESTS += test-u16-strcoll
 check_PROGRAMS += test-u16-strcoll
 test_u16_strcoll_SOURCES = unistr/test-u16-strcoll.c
+test_u16_strcoll_LDADD = $(LDADD) @LIBICONV@

diff --git a/modules/unistr/u32-strcoll-tests b/modules/unistr/u32-strcoll-tests
index 962ca4b..9ca06ba 100644 (file)
--- a/modules/unistr/u32-strcoll-tests
+++ b/modules/unistr/u32-strcoll-tests
@@ -12,3 +12,4 @@ Makefile.am:
 TESTS += test-u32-strcoll
 check_PROGRAMS += test-u32-strcoll
 test_u32_strcoll_SOURCES = unistr/test-u32-strcoll.c
+test_u32_strcoll_LDADD = $(LDADD) @LIBICONV@

diff --git a/modules/unistr/u8-strcoll-tests b/modules/unistr/u8-strcoll-tests
index 5470f9a..095409a 100644 (file)
--- a/modules/unistr/u8-strcoll-tests
+++ b/modules/unistr/u8-strcoll-tests
@@ -12,3 +12,4 @@ Makefile.am:
 TESTS += test-u8-strcoll
 check_PROGRAMS += test-u8-strcoll
 test_u8_strcoll_SOURCES = unistr/test-u8-strcoll.c
+test_u8_strcoll_LDADD = $(LDADD) @LIBICONV@