--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2007-10-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix linking of some uniconv tests on FreeBSD.
+	* modules/uniconv/u16-conv-from-enc-tests
+	(test_u16_conv_from_enc_LDADD): Link $(LDADD) before @LIBICONV@.
+	* modules/uniconv/u16-conv-to-enc-tests
+	(test_u16_conv_to_enc_LDADD): Likewise.
+	* modules/uniconv/u16-strconv-from-enc-tests
+	(test_u16_strconv_from_enc_LDADD): Likewise.
+	* modules/uniconv/u16-strconv-to-enc-tests
+	(test_u16_strconv_to_enc_LDADD): Likewise.
+	* modules/uniconv/u32-conv-from-enc-tests
+	(test_u32_conv_from_enc_LDADD): Likewise.
+	* modules/uniconv/u32-conv-to-enc-tests
+	(test_u32_conv_to_enc_LDADD): Likewise.
+	* modules/uniconv/u32-strconv-from-enc-tests
+	(test_u32_strconv_from_enc_LDADD): Likewise.
+	* modules/uniconv/u32-strconv-to-enc-tests
+	(test_u32_strconv_to_enc_LDADD): Likewise.
+	* modules/uniconv/u8-conv-from-enc-tests
+	(test_u8_conv_from_enc_LDADD): Likewise.
+	* modules/uniconv/u8-conv-to-enc-tests
+	(test_u8_conv_to_enc_LDADD): Likewise.
+	* modules/uniconv/u8-strconv-from-enc-tests
+	(test_u8_strconv_from_enc_LDADD): Likewise.
+	* modules/uniconv/u8-strconv-to-enc-tests
+	(test_u8_strconv_to_enc_LDADD): Likewise.
+
 2007-10-22  Bruno Haible  <bruno@clisp.org>
 
 	* lib/stdint.in.h: Add check that intmax_t and uintmax_t have the same

--- a/modules/uniconv/u16-conv-from-enc-tests
+++ b/modules/uniconv/u16-conv-from-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u16-conv-from-enc
 check_PROGRAMS += test-u16-conv-from-enc
 test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c
-test_u16_conv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u16-conv-to-enc-tests
+++ b/modules/uniconv/u16-conv-to-enc-tests
@@ -9,5 +9,5 @@
 TESTS += test-u16-conv-to-enc
 check_PROGRAMS += test-u16-conv-to-enc
 test_u16_conv_to_enc_SOURCES = uniconv/test-u16-conv-to-enc.c
-test_u16_conv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u16-strconv-from-enc-tests
+++ b/modules/uniconv/u16-strconv-from-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u16-strconv-from-enc
 check_PROGRAMS += test-u16-strconv-from-enc
 test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c
-test_u16_strconv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u16-strconv-to-enc-tests
+++ b/modules/uniconv/u16-strconv-to-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u16-strconv-to-enc
 check_PROGRAMS += test-u16-strconv-to-enc
 test_u16_strconv_to_enc_SOURCES = uniconv/test-u16-strconv-to-enc.c
-test_u16_strconv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u32-conv-from-enc-tests
+++ b/modules/uniconv/u32-conv-from-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u32-conv-from-enc
 check_PROGRAMS += test-u32-conv-from-enc
 test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c
-test_u32_conv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u32-conv-to-enc-tests
+++ b/modules/uniconv/u32-conv-to-enc-tests
@@ -9,5 +9,5 @@
 TESTS += test-u32-conv-to-enc
 check_PROGRAMS += test-u32-conv-to-enc
 test_u32_conv_to_enc_SOURCES = uniconv/test-u32-conv-to-enc.c
-test_u32_conv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u32-strconv-from-enc-tests
+++ b/modules/uniconv/u32-strconv-from-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u32-strconv-from-enc
 check_PROGRAMS += test-u32-strconv-from-enc
 test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c
-test_u32_strconv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u32-strconv-to-enc-tests
+++ b/modules/uniconv/u32-strconv-to-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u32-strconv-to-enc
 check_PROGRAMS += test-u32-strconv-to-enc
 test_u32_strconv_to_enc_SOURCES = uniconv/test-u32-strconv-to-enc.c
-test_u32_strconv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u8-conv-from-enc-tests
+++ b/modules/uniconv/u8-conv-from-enc-tests
@@ -11,5 +11,5 @@
 TESTS += test-u8-conv-from-enc
 check_PROGRAMS += test-u8-conv-from-enc
 test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c
-test_u8_conv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u8-conv-to-enc-tests
+++ b/modules/uniconv/u8-conv-to-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u8-conv-to-enc
 check_PROGRAMS += test-u8-conv-to-enc
 test_u8_conv_to_enc_SOURCES = uniconv/test-u8-conv-to-enc.c
-test_u8_conv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u8-strconv-from-enc-tests
+++ b/modules/uniconv/u8-strconv-from-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u8-strconv-from-enc
 check_PROGRAMS += test-u8-strconv-from-enc
 test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c
-test_u8_strconv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

--- a/modules/uniconv/u8-strconv-to-enc-tests
+++ b/modules/uniconv/u8-strconv-to-enc-tests
@@ -10,5 +10,5 @@
 TESTS += test-u8-strconv-to-enc
 check_PROGRAMS += test-u8-strconv-to-enc
 test_u8_strconv_to_enc_SOURCES = uniconv/test-u8-strconv-to-enc.c
-test_u8_strconv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@