From 7c886ca1ada4248c6b838d01e9e9b2158829c6b3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 31 May 2011 23:31:26 +0200 Subject: [PATCH] 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 . --- ChangeLog | 27 +++++++++++++++++++++++++++ modules/areadlinkat-tests | 1 + modules/dirent-safer-tests | 3 +++ modules/fdopendir-tests | 1 + modules/fdutimensat-tests | 2 +- modules/linkat-tests | 1 + modules/mkfifoat-tests | 1 + modules/openat-safer-tests | 1 + modules/openat-tests | 5 +++++ modules/readlinkat-tests | 1 + modules/symlinkat-tests | 1 + modules/utimensat-tests | 2 +- 12 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7baa007bb9..a8fc9faa95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +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. diff --git a/modules/areadlinkat-tests b/modules/areadlinkat-tests index 23e5278486..422ac61412 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 2bc95933fd..d516d52078 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 39575ba3f0..bee2df7df5 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 1d107ce5c1..48ea78d233 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 3f2d3f090c..76eb5deb45 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 a1e33c9812..8be33df05d 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 a33d2c6b68..1f0b158fc0 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 959d882333..250a574593 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 96faa5699b..de23df8dde 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 13ae9bd8a1..90331494a4 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 987a86abc5..26dbac6762 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@ -- 2.30.2