Fix link error on Cygwin.

diff --git a/ChangeLog b/ChangeLog
index d78b5f4f51808a93759590c26a29ce39bc81bd21..2232141613139a2ce11aebcf865cc80f11a683e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-12  Bruno Haible  <bruno@clisp.org>
+
+       * modules/iconv-tests (test_iconv_LDADD): Mention -liconv after LDADD,
+       not before, since $(LDADD) often contains libgnu.a.
+       * modules/striconv-tests (test_striconv_LDADD): Likewise.
+       * modules/striconveh-tests (test_striconveh_LDADD): Likewise.
+       * modules/striconveha-tests (test_striconveha_LDADD): Likewise.
+       Needed on Cygwin.
+
 2007-04-12  Eric Blake  <ebb9@byu.net>
 
        Work around glibc's failure to flush stdin on fclose.

diff --git a/modules/iconv-tests b/modules/iconv-tests
index 511d31218c7717eb6ec421690556052e0e5a0fa6..47381d45b2a4d4713aeb92a4d9f3f1adcbcb6228 100644 (file)
--- a/modules/iconv-tests
+++ b/modules/iconv-tests
@@ -8,5 +8,5 @@ configure.ac:
 Makefile.am:
 TESTS += test-iconv
 check_PROGRAMS += test-iconv
-test_iconv_LDADD = @LIBICONV@ $(LDADD)
+test_iconv_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/striconv-tests b/modules/striconv-tests
index 9f12ca0b9d4ee39eb78622dceba69c4f14372a0c..5efc9e058cfe445bea17f4f84bd9b3af7b596032 100644 (file)
--- a/modules/striconv-tests
+++ b/modules/striconv-tests
@@ -8,5 +8,5 @@ configure.ac:
 Makefile.am:
 TESTS += test-striconv
 check_PROGRAMS += test-striconv
-test_striconv_LDADD = @LIBICONV@ $(LDADD)
+test_striconv_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/striconveh-tests b/modules/striconveh-tests
index 91d1ae4c8820a5592f45b10e708719a5bbcbe536..1569f2bdb772b24ac7f7a102669e83976249bc47 100644 (file)
--- a/modules/striconveh-tests
+++ b/modules/striconveh-tests
@@ -8,5 +8,5 @@ configure.ac:
 Makefile.am:
 TESTS += test-striconveh
 check_PROGRAMS += test-striconveh
-test_striconveh_LDADD = @LIBICONV@ $(LDADD)
+test_striconveh_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/striconveha-tests b/modules/striconveha-tests
index 0675c7a94ebac46163937441a445eef85c5e4879..1effb575d9960edd9e1c5701ea76266a416f7fd4 100644 (file)
--- a/modules/striconveha-tests
+++ b/modules/striconveha-tests
@@ -8,5 +8,5 @@ configure.ac:
 Makefile.am:
 TESTS += test-striconveha
 check_PROGRAMS += test-striconveha
-test_striconveha_LDADD = @LIBICONV@ $(LDADD)
+test_striconveha_LDADD = $(LDADD) @LIBICONV@