X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ftls-tests;h=b9f5a2313153ad84a2294800cb1fb69c8e80a63c;hb=fb7fde6f658ac18b7ab7ca61dca9a290cc8c3348;hp=2d1f10ffd39984dce13d2835b38c9ad566b4d53f;hpb=bb469ee630001079611573fa2f9924d6b5e242a9;p=gnulib.git

diff --git a/modules/tls-tests b/modules/tls-tests
index 2d1f10ffd..b9f5a2313 100644
--- a/modules/tls-tests
+++ b/modules/tls-tests
@@ -8,12 +8,15 @@ dnl Checks for special libraries for the tests/test-tls test.
 dnl On some systems, sched_yield is in librt, rather than in libpthread.
 LIBSCHED=
 if test $gl_threads_api = posix; then
-  AC_CHECK_LIB(rt, sched_yield, [LIBSCHED=-lrt])
+  dnl Solaris has sched_yield in librt, not in libpthread or libc.
+  AC_CHECK_LIB(rt, sched_yield, [LIBSCHED=-lrt],
+    [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
+     AC_CHECK_LIB(posix4, sched_yield, [LIBSCHED=-lposix4])])
 fi
 AC_SUBST([LIBSCHED])
 
 Makefile.am:
-TESTS += test-tls$(EXEEXT)
+TESTS += test-tls
 check_PROGRAMS += test-tls
-test_tls_LDADD = @LIBMULTITHREAD@ @LIBSCHED@ $(LDADD)
+test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@