Re: build on Solaris 2.6

[Bruno Haible]

Tom G. Christensen wrote:
> > Which ones exactly, please?
> > 
> test-areadlinkat
> test-dirent-safer
> test-fdopendir
> test-fdutimensat
> test-linkat
> test-mkfifoat
> test-openat-safer
> test-fchownat
> test-fstatat
> test-mkdirat
> test-openat
> test-unlinkat
> test-readlinkat
> test-symlinkat
> test-utimensat

Here's a proposed fix. Eric, this reverts most of a commit of yours from
2011-04-28. OK to commit?


2011-05-31  Bruno Haible  <address@hidden>

        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 <address@hidden>.

--- modules/areadlinkat-tests.orig      Tue May 31 00:47:44 2011
+++ modules/areadlinkat-tests   Tue May 31 00:36:20 2011
@@ -13,3 +13,4 @@
 Makefile.am:
 TESTS += test-areadlinkat
 check_PROGRAMS += test-areadlinkat
+test_areadlinkat_LDADD = $(LDADD) @LIBINTL@
--- modules/dirent-safer-tests.orig     Tue May 31 00:47:44 2011
+++ modules/dirent-safer-tests  Tue May 31 00:38:30 2011
@@ -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)
--- modules/fdopendir-tests.orig        Tue May 31 00:47:44 2011
+++ modules/fdopendir-tests     Tue May 31 00:36:20 2011
@@ -12,3 +12,4 @@
 Makefile.am:
 TESTS += test-fdopendir
 check_PROGRAMS += test-fdopendir
+test_fdopendir_LDADD = $(LDADD) @LIBINTL@
--- modules/fdutimensat-tests.orig      Tue May 31 00:47:44 2011
+++ modules/fdutimensat-tests   Tue May 31 00:36:20 2011
@@ -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@
--- modules/linkat-tests.orig   Tue May 31 00:47:44 2011
+++ modules/linkat-tests        Tue May 31 00:36:20 2011
@@ -17,3 +17,4 @@
 Makefile.am:
 TESTS += test-linkat
 check_PROGRAMS += test-linkat
+test_linkat_LDADD = $(LDADD) @LIBINTL@
--- modules/mkfifoat-tests.orig Tue May 31 00:47:44 2011
+++ modules/mkfifoat-tests      Tue May 31 00:36:20 2011
@@ -13,3 +13,4 @@
 Makefile.am:
 TESTS += test-mkfifoat
 check_PROGRAMS += test-mkfifoat
+test_mkfifoat_LDADD = $(LDADD) @LIBINTL@
--- modules/openat-safer-tests.orig     Tue May 31 00:47:44 2011
+++ modules/openat-safer-tests  Tue May 31 00:36:20 2011
@@ -9,3 +9,4 @@
 Makefile.am:
 TESTS += test-openat-safer
 check_PROGRAMS += test-openat-safer
+test_openat_safer_LDADD = $(LDADD) @LIBINTL@
--- modules/openat-tests.orig   Tue May 31 00:47:44 2011
+++ modules/openat-tests        Tue May 31 00:36:20 2011
@@ -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@
--- modules/readlinkat-tests.orig       Tue May 31 00:47:45 2011
+++ modules/readlinkat-tests    Tue May 31 00:36:20 2011
@@ -13,3 +13,4 @@
 Makefile.am:
 TESTS += test-readlinkat
 check_PROGRAMS += test-readlinkat
+test_readlinkat_LDADD = $(LDADD) @LIBINTL@
--- modules/symlinkat-tests.orig        Tue May 31 00:47:45 2011
+++ modules/symlinkat-tests     Tue May 31 00:36:20 2011
@@ -12,3 +12,4 @@
 Makefile.am:
 TESTS += test-symlinkat
 check_PROGRAMS += test-symlinkat
+test_symlinkat_LDADD = $(LDADD) @LIBINTL@
--- modules/utimensat-tests.orig        Tue May 31 00:47:45 2011
+++ modules/utimensat-tests     Tue May 31 00:36:20 2011
@@ -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@

-- 
In memoriam Otto Neururer <http://de.wikipedia.org/wiki/Otto_Neururer>