X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flock-tests;h=7c72c94734db4958f73b6d01b017f31b20a7b4df;hb=ca3910da774f8ae6c4a2b6b8a8729b10ccc97ad4;hp=95607b6401ee231cf42d2a4f68ad4d558c84a2e2;hpb=bb469ee630001079611573fa2f9924d6b5e242a9;p=gnulib.git

diff --git a/modules/lock-tests b/modules/lock-tests
index 95607b640..7c72c9473 100644
--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -8,12 +8,14 @@ dnl Checks for special libraries for the tests/test-lock 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-lock$(EXEEXT)
+TESTS += test-lock
 check_PROGRAMS += test-lock
-test_lock_LDADD = @LIBMULTITHREAD@ @LIBSCHED@ $(LDADD)
-
+test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@