--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-05-31  Bruno Haible  <bruno@clisp.org>
+
+	Fix link errors in tests: openat-die uses gettext-h.
+	* modules/areadlinkat-tests (Makefile.am): Link test-areadlinkat
+	against $(LIBINTL).
+	* modules/dirent-safer-tests (Makefile.am): Link test-dirent-safer
+	against $(LIBINTL).
+	* modules/fdopendir-tests (Makefile.am): Link test-fdopendir against
+	$(LIBINTL).
+	* modules/fdutimensat-tests (Makefile.am): Link test-fdutimensat
+	against $(LIBINTL).
+	* modules/linkat-tests (Makefile.am): Link test-linkat against
+	$(LIBINTL).
+	* modules/mkfifoat-tests (Makefile.am): Link test-mkfifoat against
+	$(LIBINTL).
+	* modules/openat-safer-tests (Makefile.am): Link test-openat-safer
+	against $(LIBINTL).
+	* modules/openat-tests (Makefile.am): Link test-fchownat, test-fstatat,
+	test-mkdirat, test-openat, test-unlinkat against $(LIBINTL).
+	* modules/readlinkat-tests (Makefile.am): Link test-readlinkat against
+	$(LIBINTL).
+	* modules/symlinkat-tests (Makefile.am): Link test-symlinkat against
+	$(LIBINTL).
+	* modules/utimensat-tests (Makefile.am): Link test-utimensat against
+	$(LIBINTL).
+	Reported by Tom G. Christensen <tgc@jupiterrise.com>.
+
 2011-05-31  Bruno Haible  <bruno@clisp.org>
 
 	Fix link errors in tests: wait-process uses gettext-h.

--- a/modules/areadlinkat-tests
+++ b/modules/areadlinkat-tests
@@ -13,3 +13,4 @@
 Makefile.am:
 TESTS += test-areadlinkat
 check_PROGRAMS += test-areadlinkat
+test_areadlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/dirent-safer-tests
+++ b/modules/dirent-safer-tests
@@ -10,3 +10,6 @@
 Makefile.am:
 TESTS += test-dirent-safer
 check_PROGRAMS += test-dirent-safer
+# Link with libintl when needed. dirent-safer uses fdopendir if it is present,
+# and fdopendir indirectly depends on openat-die -> gettext-h.
+test_dirent_safer_LDADD = $(LDADD) $(LIBINTL)

--- a/modules/fdopendir-tests
+++ b/modules/fdopendir-tests
@@ -12,3 +12,4 @@
 Makefile.am:
 TESTS += test-fdopendir
 check_PROGRAMS += test-fdopendir
+test_fdopendir_LDADD = $(LDADD) @LIBINTL@

--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -19,4 +19,4 @@
 Makefile.am:
 TESTS += test-fdutimensat
 check_PROGRAMS += test-fdutimensat
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@

--- a/modules/linkat-tests
+++ b/modules/linkat-tests
@@ -17,3 +17,4 @@
 Makefile.am:
 TESTS += test-linkat
 check_PROGRAMS += test-linkat
+test_linkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/mkfifoat-tests
+++ b/modules/mkfifoat-tests
@@ -13,3 +13,4 @@
 Makefile.am:
 TESTS += test-mkfifoat
 check_PROGRAMS += test-mkfifoat
+test_mkfifoat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/openat-safer-tests
+++ b/modules/openat-safer-tests
@@ -9,3 +9,4 @@
 Makefile.am:
 TESTS += test-openat-safer
 check_PROGRAMS += test-openat-safer
+test_openat_safer_LDADD = $(LDADD) @LIBINTL@

--- a/modules/openat-tests
+++ b/modules/openat-tests
@@ -31,3 +31,8 @@
 TESTS += test-fchownat test-fstatat test-mkdirat test-openat test-unlinkat
 check_PROGRAMS += test-fchownat test-fstatat test-mkdirat test-openat \
   test-unlinkat
+test_fchownat_LDADD = $(LDADD) @LIBINTL@
+test_fstatat_LDADD = $(LDADD) @LIBINTL@
+test_mkdirat_LDADD = $(LDADD) @LIBINTL@
+test_openat_LDADD = $(LDADD) @LIBINTL@
+test_unlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/readlinkat-tests
+++ b/modules/readlinkat-tests
@@ -13,3 +13,4 @@
 Makefile.am:
 TESTS += test-readlinkat
 check_PROGRAMS += test-readlinkat
+test_readlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/symlinkat-tests
+++ b/modules/symlinkat-tests
@@ -12,3 +12,4 @@
 Makefile.am:
 TESTS += test-symlinkat
 check_PROGRAMS += test-symlinkat
+test_symlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -19,4 +19,4 @@
 Makefile.am:
 TESTS += test-utimensat
 check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@