diff options
| author | Bruno Haible <bruno@clisp.org> | 2019-12-03 04:54:53 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-12-03 04:55:39 +0100 |
| commit | af16e1b401433476796c3bab5245c0a679c4dd26 (patch) | |
| tree | 7f278d466c51f0f5597d34dce81a7f91defebef0 | |
| parent | 9b2dcfaf45493f1527ea8d01f7634407de750978 (diff) | |
| download | gnulib-af16e1b401433476796c3bab5245c0a679c4dd26.tar.gz | |
Fix mistakes in --enable-threads=isoc fixes from 2019-12-01.
* m4/pthread-mutex.m4 (gl_PTHREAD_MUTEX): Use LIBPMULTITHREAD, not
LIBMULTITHREAD.
* m4/pthread-rwlock.m4 (gl_PTHREAD_RWLOCK): Likewise.
* m4/pthread-thread.m4 (gl_PTHREAD_THREAD): Likewise.
* m4/timer_time.m4 (gl_TIMER_TIME): Likewise. Require gl_PTHREADLIB, not
gl_THREADLIB.
* modules/timer-time (Depends-on): Add pthread-h. Remove threadlib.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | m4/pthread-mutex.m4 | 4 | ||||
| -rw-r--r-- | m4/pthread-rwlock.m4 | 4 | ||||
| -rw-r--r-- | m4/pthread-thread.m4 | 4 | ||||
| -rw-r--r-- | m4/timer_time.m4 | 8 | ||||
| -rw-r--r-- | modules/timer-time | 2 |
6 files changed, 22 insertions, 11 deletions
@@ -1,5 +1,16 @@ 2019-12-02 Bruno Haible <bruno@clisp.org> + Fix mistakes in --enable-threads=isoc fixes from 2019-12-01. + * m4/pthread-mutex.m4 (gl_PTHREAD_MUTEX): Use LIBPMULTITHREAD, not + LIBMULTITHREAD. + * m4/pthread-rwlock.m4 (gl_PTHREAD_RWLOCK): Likewise. + * m4/pthread-thread.m4 (gl_PTHREAD_THREAD): Likewise. + * m4/timer_time.m4 (gl_TIMER_TIME): Likewise. Require gl_PTHREADLIB, not + gl_THREADLIB. + * modules/timer-time (Depends-on): Add pthread-h. Remove threadlib. + +2019-12-02 Bruno Haible <bruno@clisp.org> + 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. diff --git a/m4/pthread-mutex.m4 b/m4/pthread-mutex.m4 index abe5f2ffd8..044fa68594 100644 --- a/m4/pthread-mutex.m4 +++ b/m4/pthread-mutex.m4 @@ -1,4 +1,4 @@ -# pthread-mutex.m4 serial 2 +# pthread-mutex.m4 serial 3 dnl Copyright (C) 2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -43,7 +43,7 @@ AC_DEFUN([gl_PTHREAD_MUTEX], AC_CACHE_CHECK([for pthread_mutexattr_getrobust], [gl_cv_func_pthread_mutexattr_getrobust], [saved_LIBS="$LIBS" - LIBS="$LIBS $LIBMULTITHREAD" + LIBS="$LIBS $LIBPMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_SOURCE( [[extern diff --git a/m4/pthread-rwlock.m4 b/m4/pthread-rwlock.m4 index ee5953c74b..32bca6a594 100644 --- a/m4/pthread-rwlock.m4 +++ b/m4/pthread-rwlock.m4 @@ -1,4 +1,4 @@ -# pthread-rwlock.m4 serial 1 +# pthread-rwlock.m4 serial 2 dnl Copyright (C) 2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -43,7 +43,7 @@ AC_DEFUN([gl_PTHREAD_RWLOCK], AC_CACHE_CHECK([for pthread_rwlock_init], [gl_cv_func_pthread_rwlock_init], [saved_LIBS="$LIBS" - LIBS="$LIBS $LIBMULTITHREAD" + LIBS="$LIBS $LIBPMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_SOURCE( [[extern diff --git a/m4/pthread-thread.m4 b/m4/pthread-thread.m4 index eef29c9933..e274d11481 100644 --- a/m4/pthread-thread.m4 +++ b/m4/pthread-thread.m4 @@ -1,4 +1,4 @@ -# pthread-thread.m4 serial 1 +# pthread-thread.m4 serial 2 dnl Copyright (C) 2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -41,7 +41,7 @@ AC_DEFUN([gl_PTHREAD_THREAD], AC_CACHE_CHECK([whether pthread_create exists as a global function], [gl_cv_func_pthread_create], [saved_LIBS="$LIBS" - LIBS="$LIBS $LIBMULTITHREAD" + LIBS="$LIBS $LIBPMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_SOURCE( [[extern diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index 2c9b93c63b..347d04dbe4 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -1,4 +1,4 @@ -# timer_time.m4 serial 3 +# timer_time.m4 serial 4 dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ AC_DEFUN([gl_TIMER_TIME], dnl Some packages like Emacs use --avoid=threadlib. dnl Write the symbol in such a way that it does not cause 'aclocal' to pick dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/. - m4_ifdef([gl_][THREADLIB], [AC_REQUIRE([gl_][THREADLIB])]) + m4_ifdef([gl_][PTHREADLIB], [AC_REQUIRE([gl_][PTHREADLIB])]) LIB_TIMER_TIME= AC_SUBST([LIB_TIMER_TIME]) @@ -24,7 +24,7 @@ AC_DEFUN([gl_TIMER_TIME], AC_SEARCH_LIBS([timer_settime], [rt posix4], [test "$ac_cv_search_timer_settime" = "none required" || LIB_TIMER_TIME=$ac_cv_search_timer_settime]) - m4_ifdef([gl_][THREADLIB], + m4_ifdef([gl_][PTHREADLIB], [dnl GLIBC uses threads to emulate posix timers when kernel support dnl is not available (like Linux < 2.6 or when used with kFreeBSD) dnl Now the pthread lib is linked automatically in the normal case, @@ -38,7 +38,7 @@ AC_DEFUN([gl_TIMER_TIME], #endif #endif ], - [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD"])]) + [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBPMULTITHREAD"])]) AC_CHECK_FUNCS([timer_settime]) LIBS=$gl_saved_libs ]) diff --git a/modules/timer-time b/modules/timer-time index e3668c86a5..7f496d78d7 100644 --- a/modules/timer-time +++ b/modules/timer-time @@ -7,7 +7,7 @@ m4/timer_time.m4 Depends-on: extensions -threadlib +pthread-h configure.ac: gl_TIMER_TIME |