From: Bruno Haible <bruno@clisp.org>
Date: Sat, 30 Aug 2008 22:01:36 +0000 (+0200)
Subject: Undo unintentional commit.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcf49e35108a6a1897f15090e22dcd9763872292;p=pspp

Undo unintentional commit.
---

diff --git a/modules/lock-tests b/modules/lock-tests
index d0e5010508..7c72c94734 100644
--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -2,12 +2,20 @@ Files:
 tests/test-lock.c
 
 Depends-on:
-thread
-yield
 
 configure.ac:
+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
+  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
 check_PROGRAMS += test-lock
-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
+test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@
diff --git a/modules/tls-tests b/modules/tls-tests
index 107cfe45f6..b9f5a23131 100644
--- a/modules/tls-tests
+++ b/modules/tls-tests
@@ -2,13 +2,21 @@ Files:
 tests/test-tls.c
 
 Depends-on:
-thread
-yield
 
 configure.ac:
+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
+  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
 check_PROGRAMS += test-tls
-test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
+test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@