Mercurial > hg > octave-lojdl > gnulib-hg

changeset 10378:500c5ea49ecf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undo unintentional commit.
author Bruno Haible <bruno@clisp.org>
date Sun, 31 Aug 2008 00:01:36 +0200
parents ceb93e505c89
children a4e295b67e54
files modules/lock-tests modules/tls-tests
diffstat 2 files changed, 22 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -2,12 +2,20 @@
 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@
--- a/modules/tls-tests
+++ b/modules/tls-tests
@@ -2,13 +2,21 @@
 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@