--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2007-10-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix linking of some unistdio tests on FreeBSD.
+	* modules/unistdio/u16-vsnprintf-tests
+	(test_u16_vsprintf1_LDADD): Add @LIBINTL@.
+	* modules/unistdio/u16-vsprintf-tests
+	(test_u16_vsnprintf1_LDADD): Likewise.
+	* modules/unistdio/u32-vsnprintf-tests
+	(test_u32_vsnprintf1_LDADD): Likewise.
+	* modules/unistdio/u32-vsprintf-tests
+	(test_u32_vsprintf1_LDADD): Likewise.
+	* modules/unistdio/u8-vsnprintf-tests
+	(test_u8_vsnprintf1_LDADD): Likewise.
+	* modules/unistdio/u8-vsprintf-tests
+	(test_u8_vsprintf1_LDADD): Likewise.
+	* modules/unistdio/ulc-vsnprintf-tests
+	(test_ulc_vsnprintf1_LDADD): Likewise.
+	* modules/unistdio/ulc-vsprintf-tests
+	(test_ulc_vsprintf1_LDADD): Likewise.
+
 	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@.

--- a/modules/unistdio/u16-vsnprintf-tests
+++ b/modules/unistdio/u16-vsnprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-u16-vsnprintf1
 check_PROGRAMS += test-u16-vsnprintf1
 test_u16_vsnprintf1_SOURCES = unistdio/test-u16-vsnprintf1.c
-test_u16_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/u16-vsprintf-tests
+++ b/modules/unistdio/u16-vsprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-u16-vsprintf1
 check_PROGRAMS += test-u16-vsprintf1
 test_u16_vsprintf1_SOURCES = unistdio/test-u16-vsprintf1.c
-test_u16_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/u32-vsnprintf-tests
+++ b/modules/unistdio/u32-vsnprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-u32-vsnprintf1
 check_PROGRAMS += test-u32-vsnprintf1
 test_u32_vsnprintf1_SOURCES = unistdio/test-u32-vsnprintf1.c
-test_u32_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/u32-vsprintf-tests
+++ b/modules/unistdio/u32-vsprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-u32-vsprintf1
 check_PROGRAMS += test-u32-vsprintf1
 test_u32_vsprintf1_SOURCES = unistdio/test-u32-vsprintf1.c
-test_u32_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/u8-vsnprintf-tests
+++ b/modules/unistdio/u8-vsnprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-u8-vsnprintf1
 check_PROGRAMS += test-u8-vsnprintf1
 test_u8_vsnprintf1_SOURCES = unistdio/test-u8-vsnprintf1.c
-test_u8_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/u8-vsprintf-tests
+++ b/modules/unistdio/u8-vsprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-u8-vsprintf1
 check_PROGRAMS += test-u8-vsprintf1
 test_u8_vsprintf1_SOURCES = unistdio/test-u8-vsprintf1.c
-test_u8_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/ulc-vsnprintf-tests
+++ b/modules/unistdio/ulc-vsnprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-ulc-vsnprintf1
 check_PROGRAMS += test-ulc-vsnprintf1
 test_ulc_vsnprintf1_SOURCES = unistdio/test-ulc-vsnprintf1.c
-test_ulc_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_ulc_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@

--- a/modules/unistdio/ulc-vsprintf-tests
+++ b/modules/unistdio/ulc-vsprintf-tests
@@ -11,4 +11,4 @@
 TESTS += test-ulc-vsprintf1
 check_PROGRAMS += test-ulc-vsprintf1
 test_ulc_vsprintf1_SOURCES = unistdio/test-ulc-vsprintf1.c
-test_ulc_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_ulc_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@