From: Paul Eggert Date: Sun, 3 Oct 2021 00:50:48 +0000 (-0700) Subject: timer-time: port better to OpenBSD 6.9 X-Git-Tag: v1.0~2575 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=dd0af10fa597a95ffe5f4f110ef5edefc2f680bc;p=gnulib.git timer-time: port better to OpenBSD 6.9 * m4/timer_time.m4 (gl_TIMER_TIME): Also require timer_settime to be declared, as it exists in OpenBSD but always fails with ENOSYS. --- diff --git a/ChangeLog b/ChangeLog index 9bae3c4a39..232d2dec3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2021-10-02 Paul Eggert + timer-time: port better to OpenBSD 6.9 + * m4/timer_time.m4 (gl_TIMER_TIME): Also require timer_settime to + be declared, as it exists in OpenBSD but always fails with ENOSYS. + sys_select: port better to OpenBSD 6.9 OpenBSD 6.9’s includes which then includes , which caused coreutils/lib/nproc.c compiles diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index f0e5785e9a..003e36e9d1 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -1,4 +1,4 @@ -# timer_time.m4 serial 4 +# timer_time.m4 serial 5 dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,9 +18,13 @@ AC_DEFUN([gl_TIMER_TIME], dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/. m4_ifdef([gl_][PTHREADLIB], [AC_REQUIRE([gl_][PTHREADLIB])]) + AC_CHECK_DECL([timer_settime], [], [], + [[#include + ]]) LIB_TIMER_TIME= AC_SUBST([LIB_TIMER_TIME]) - gl_saved_libs=$LIBS + AS_IF([test "$ac_cv_have_decl_timer_settime" = yes], [ + gl_saved_libs=$LIBS AC_SEARCH_LIBS([timer_settime], [rt posix4], [test "$ac_cv_search_timer_settime" = "none required" || LIB_TIMER_TIME=$ac_cv_search_timer_settime]) @@ -40,5 +44,6 @@ AC_DEFUN([gl_TIMER_TIME], ], [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBPMULTITHREAD"])]) AC_CHECK_FUNCS([timer_settime]) - LIBS=$gl_saved_libs + LIBS=$gl_saved_libs + ]) ])