From: Bruno Haible Date: Tue, 31 May 2011 21:31:26 +0000 (+0200) Subject: Fix link errors in tests: openat-die uses gettext-h. X-Git-Tag: stable/20110609~40 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=802ee67ef72e378c633b54963c65f1fe89f00d4f;p=gnulib.git 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 . (cherry picked from commit 7c886ca1ada4248c6b838d01e9e9b2158829c6b3) --- diff --git a/ChangeLog b/ChangeLog index fb9c992a8..1114ec9ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,32 @@ 2011-05-31 Bruno Haible + 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 . + +2011-05-31 Bruno Haible + Fix link errors in tests: wait-process uses gettext-h. * modules/nonblocking-pipe-tests (Makefile.am): Set test_nonblocking_pipe_main_LDADD. diff --git a/modules/areadlinkat-tests b/modules/areadlinkat-tests index 23e527848..422ac6141 100644 --- a/modules/areadlinkat-tests +++ b/modules/areadlinkat-tests @@ -13,3 +13,4 @@ configure.ac: Makefile.am: TESTS += test-areadlinkat check_PROGRAMS += test-areadlinkat +test_areadlinkat_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/dirent-safer-tests b/modules/dirent-safer-tests index 2bc95933f..d516d5207 100644 --- a/modules/dirent-safer-tests +++ b/modules/dirent-safer-tests @@ -10,3 +10,6 @@ configure.ac: 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) diff --git a/modules/fdopendir-tests b/modules/fdopendir-tests index 39575ba3f..bee2df7df 100644 --- a/modules/fdopendir-tests +++ b/modules/fdopendir-tests @@ -12,3 +12,4 @@ configure.ac: Makefile.am: TESTS += test-fdopendir check_PROGRAMS += test-fdopendir +test_fdopendir_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests index 1d107ce5c..48ea78d23 100644 --- a/modules/fdutimensat-tests +++ b/modules/fdutimensat-tests @@ -19,4 +19,4 @@ configure.ac: Makefile.am: TESTS += test-fdutimensat check_PROGRAMS += test-fdutimensat -test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ diff --git a/modules/linkat-tests b/modules/linkat-tests index 3f2d3f090..76eb5deb4 100644 --- a/modules/linkat-tests +++ b/modules/linkat-tests @@ -17,3 +17,4 @@ configure.ac: Makefile.am: TESTS += test-linkat check_PROGRAMS += test-linkat +test_linkat_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/mkfifoat-tests b/modules/mkfifoat-tests index a1e33c981..8be33df05 100644 --- a/modules/mkfifoat-tests +++ b/modules/mkfifoat-tests @@ -13,3 +13,4 @@ configure.ac: Makefile.am: TESTS += test-mkfifoat check_PROGRAMS += test-mkfifoat +test_mkfifoat_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/openat-safer-tests b/modules/openat-safer-tests index a33d2c6b6..1f0b158fc 100644 --- a/modules/openat-safer-tests +++ b/modules/openat-safer-tests @@ -9,3 +9,4 @@ configure.ac: Makefile.am: TESTS += test-openat-safer check_PROGRAMS += test-openat-safer +test_openat_safer_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/openat-tests b/modules/openat-tests index 959d88233..250a57459 100644 --- a/modules/openat-tests +++ b/modules/openat-tests @@ -31,3 +31,8 @@ Makefile.am: 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@ diff --git a/modules/readlinkat-tests b/modules/readlinkat-tests index 96faa5699..de23df8dd 100644 --- a/modules/readlinkat-tests +++ b/modules/readlinkat-tests @@ -13,3 +13,4 @@ configure.ac: Makefile.am: TESTS += test-readlinkat check_PROGRAMS += test-readlinkat +test_readlinkat_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/symlinkat-tests b/modules/symlinkat-tests index 13ae9bd8a..90331494a 100644 --- a/modules/symlinkat-tests +++ b/modules/symlinkat-tests @@ -12,3 +12,4 @@ configure.ac: Makefile.am: TESTS += test-symlinkat check_PROGRAMS += test-symlinkat +test_symlinkat_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/utimensat-tests b/modules/utimensat-tests index 987a86abc..26dbac676 100644 --- a/modules/utimensat-tests +++ b/modules/utimensat-tests @@ -19,4 +19,4 @@ configure.ac: Makefile.am: TESTS += test-utimensat check_PROGRAMS += test-utimensat -test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@