From: Bruno Haible Date: Sun, 15 Oct 2023 19:57:26 +0000 (+0200) Subject: pthread_mutex_timedlock: Fix link errors on FreeBSD 5.2.1/i386. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b2f0b9685afb820a6856350df530fdd33db73ed8;p=gnulib.git pthread_mutex_timedlock: Fix link errors on FreeBSD 5.2.1/i386. * m4/pthread_mutex_timedlock.m4 (gl_FUNC_PTHREAD_MUTEX_TIMEDLOCK): Test not only whether pthread_mutex_timedlock is declared, but also whether it is actually defined. --- diff --git a/ChangeLog b/ChangeLog index 1888aea1cc..2b6e326d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-10-15 Bruno Haible + + pthread_mutex_timedlock: Fix link errors on FreeBSD 5.2.1/i386. + * m4/pthread_mutex_timedlock.m4 (gl_FUNC_PTHREAD_MUTEX_TIMEDLOCK): Test + not only whether pthread_mutex_timedlock is declared, but also whether + it is actually defined. + 2023-10-15 Bruno Haible threadlib: Fix link errors on FreeBSD 5.2.1/i386. diff --git a/m4/pthread_mutex_timedlock.m4 b/m4/pthread_mutex_timedlock.m4 index 6686720805..b8eb81bda9 100644 --- a/m4/pthread_mutex_timedlock.m4 +++ b/m4/pthread_mutex_timedlock.m4 @@ -1,4 +1,4 @@ -# pthread_mutex_timedlock.m4 serial 2 +# pthread_mutex_timedlock.m4 serial 3 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,6 +8,39 @@ AC_DEFUN([gl_FUNC_PTHREAD_MUTEX_TIMEDLOCK], [ AC_REQUIRE([gl_PTHREAD_H_DEFAULTS]) - AC_CHECK_DECL([pthread_mutex_timedlock], , [HAVE_PTHREAD_MUTEX_TIMEDLOCK=0], + AC_CHECK_DECL([pthread_mutex_timedlock], + [dnl Test whether the gnulib module 'threadlib' is in use. + 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]) + dnl Test whether the function actually exists. + dnl FreeBSD 5.2.1 declares it but does not define it. + AC_CACHE_CHECK([for pthread_mutex_timedlock], + [gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD], + [gl_save_LIBS="$LIBS" + LIBS="$LIBS $LIBMULTITHREAD" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + ]], + [[pthread_mutex_t *lock; + return pthread_mutex_timedlock (&lock, (struct timespec *) 0); + ]]) + ], + [gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD=yes], + [gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD=no]) + LIBS="$gl_save_LIBS" + ]) + if test $gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD != yes; then + HAVE_PTHREAD_MUTEX_TIMEDLOCK=0 + fi + ], [ + : + ]) + ], + [HAVE_PTHREAD_MUTEX_TIMEDLOCK=0], [[#include ]]) ])