diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-12-06 15:16:15 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-12-06 15:17:08 -0800 |
| commit | c4cd2a0b9f251ed830ef32ac6537e62ae5e3d944 (patch) | |
| tree | 25aec8ec7432bae87fd6b38f06a6d191d96151c4 /m4/timer_time.m4 | |
| parent | 99ad65eda44e3b6edcc51cf0fb70ea499c3ccb07 (diff) | |
| download | emacs-c4cd2a0b9f251ed830ef32ac6537e62ae5e3d944.tar.gz | |
Update from Gnulib
This incorporates:
2019-12-06 nstrftime: better width support for %N, %z
2019-12-03 Avoid hassles caused by [[noreturn]] in C++
2019-12-02 Fix mistakes in --enable-threads=isoc fixes from 2019-12-01
* admin/merge-gnulib (AVOIDED_MODULES): Avoid pthread-h.
* lib/_Noreturn.h, lib/nstrftime.c, m4/gnulib-common.m4:
* m4/timer_time.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'm4/timer_time.m4')
| -rw-r--r-- | m4/timer_time.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index 2c9b93c63b8..347d04dbe45 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 ]) |