mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
a615a3aeef
This should fix an OS X build problem reported by Ivan Andrus in <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00671.html>. * admin/merge-gnulib (GNULIB_MODULES): Add timer-time. * configure.ac (gl_THREADLIB): Define to empty, since Emacs does threads its own way. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * m4/timer_time.m4: New file, from gnulib. * src/atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer): Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to call timer_settime.
40 lines
1.3 KiB
Plaintext
40 lines
1.3 KiB
Plaintext
# timer_time.m4 serial 2
|
|
dnl Copyright (C) 2011-2012 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 with or without modifications, as long as this notice is preserved.
|
|
|
|
# Check for timer_settime, and set LIB_TIMER_TIME.
|
|
|
|
AC_DEFUN([gl_TIMER_TIME],
|
|
[
|
|
dnl Based on clock_time.m4. See details there.
|
|
|
|
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
|
AC_REQUIRE([gl_THREADLIB])
|
|
|
|
LIB_TIMER_TIME=
|
|
AC_SUBST([LIB_TIMER_TIME])
|
|
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])
|
|
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,
|
|
dnl but when linking statically, it needs to be explicitly specified.
|
|
AC_EGREP_CPP([Thread],
|
|
[
|
|
#include <features.h>
|
|
#ifdef __GNU_LIBRARY__
|
|
#if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
|
|
&& !defined __UCLIBC__
|
|
Thread emulation available
|
|
#endif
|
|
#endif
|
|
],
|
|
[LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD"])
|
|
AC_CHECK_FUNCS([timer_settime])
|
|
LIBS=$gl_saved_libs
|
|
])
|