From 88e3bc88c74c6293fd3e3d229da893385fdfad7d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 2 Aug 2014 14:50:13 -0700 Subject: [PATCH] * configure.ac (HAVE_TIMERFD): Also check for TFD_NONBLOCK, since the code is using TFD_NONBLOCK now. --- ChangeLog | 5 +++++ configure.ac | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2dfef7037fe..0fc361060fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-08-02 Paul Eggert + + * configure.ac (HAVE_TIMERFD): Also check for TFD_NONBLOCK, + since the code is using TFD_NONBLOCK now. + 2014-07-31 Paul Eggert Simplify timerfd configuration and fix some minor glitches. diff --git a/configure.ac b/configure.ac index 4f3fde56af2..7e101aa9fc9 100644 --- a/configure.ac +++ b/configure.ac @@ -3714,9 +3714,10 @@ AC_SUBST(TERMCAP_OBJ) AC_CACHE_CHECK([for timerfd interface], [emacs_cv_have_timerfd], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include - ]], - [[timerfd_create (CLOCK_REALTIME, TFD_CLOEXEC); - timerfd_settime (0, TFD_TIMER_ABSTIME, 0, 0);]])], + ]], + [[timerfd_create (CLOCK_REALTIME, + TFD_CLOEXEC | TFD_NONBLOCK); + timerfd_settime (0, TFD_TIMER_ABSTIME, 0, 0);]])], [emacs_cv_have_timerfd=yes], [emacs_cv_have_timerfd=no])]) if test "$emacs_cv_have_timerfd" = yes; then -- 2.39.5