+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.
-# 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,
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
-# 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,
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
-# 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,
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
-# 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,
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])
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,
#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
])
Depends-on:
extensions
-threadlib
+pthread-h
configure.ac:
gl_TIMER_TIME