>From 9b2dcfaf45493f1527ea8d01f7634407de750978 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 3 Dec 2019 03:49:30 +0100 Subject: [PATCH 1/3] Fix some more link errors with --enable-threads=isoc. * modules/pthread-mutex (Depends-on): Test $gl_threads_api differently. * modules/pthread-rwlock (Depends-on): Likewise. --- ChangeLog | 6 ++++++ modules/pthread-mutex | 2 +- modules/pthread-rwlock | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 159f32c..7fc89a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2019-12-02 Bruno Haible + Fix some more link errors with --enable-threads=isoc. + * modules/pthread-mutex (Depends-on): Test $gl_threads_api differently. + * modules/pthread-rwlock (Depends-on): Likewise. + +2019-12-02 Bruno Haible + Fix link errors with --enable-threads=posix on AIX. * modules/string-c++-tests (Makefile.am): Link the test-string-c++ program with $(LIBTHREAD). diff --git a/modules/pthread-mutex b/modules/pthread-mutex index 556ffa8..9fdd2fe 100644 --- a/modules/pthread-mutex +++ b/modules/pthread-mutex @@ -7,7 +7,7 @@ m4/pthread-mutex.m4 Depends-on: pthread-h -pthread_mutex_timedlock [test $gl_threads_api = posix] +pthread_mutex_timedlock [test $gl_threads_api != windows] windows-timedmutex [test $gl_threads_api = windows] windows-timedrecmutex [test $gl_threads_api = windows] diff --git a/modules/pthread-rwlock b/modules/pthread-rwlock index e935414..4944edd 100644 --- a/modules/pthread-rwlock +++ b/modules/pthread-rwlock @@ -7,8 +7,8 @@ m4/pthread-rwlock.m4 Depends-on: pthread-h -pthread-cond [test $gl_threads_api = posix && test $REPLACE_PTHREAD_RWLOCK_INIT = 1] -nanosleep [test $gl_threads_api = posix && test $HAVE_PTHREAD_RWLOCK_INIT = 1 && test $HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK = 0] +pthread-cond [test $gl_threads_api != windows && test $REPLACE_PTHREAD_RWLOCK_INIT = 1] +nanosleep [test $gl_threads_api != windows && test $HAVE_PTHREAD_RWLOCK_INIT = 1 && test $HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK = 0] windows-timedrwlock [test $gl_threads_api = windows] configure.ac: -- 2.7.4