improve timer support detection

Author: dunglas

Zend/Zend.m4

@@ -269,6 +269,28 @@ fi
 AC_MSG_CHECKING(whether to enable zend signal handling)
 AC_MSG_RESULT($ZEND_SIGNALS)
 
+dnl By default, enable Zend Timer only for ZTS builds
+AC_ARG_ENABLE([zend-timer],
+  [AS_HELP_STRING([--enable-zend-timer],
+    [whether to enable zend timer system])],
+    [ZEND_TIMER=$enableval],
+    [ZEND_TIMER=$ZEND_ZTS])
+
+AS_CASE(["$host_alias"], [*linux*], [], [ZEND_TIMER='no'])
+
+PHP_CHECK_FUNC(timer_create, rt)
+if test "$ac_cv_func_timer_create" != "yes"; then
+  ZEND_TIMER='no'
+fi
+
+if test "$ZEND_TIMER" = "yes"; then
+  AC_DEFINE(ZEND_TIMER, 1, [Use zend timer system])
+  CFLAGS="$CFLAGS -DZEND_TIMER"
+fi
+
+AC_MSG_CHECKING(whether to enable zend timer system)
+AC_MSG_RESULT($ZEND_TIMER)
+
 ])
 
 AC_MSG_CHECKING(whether /dev/urandom exists)

Zend/zend_timer.c

@@ -14,8 +14,6 @@
    +----------------------------------------------------------------------+
  */
 
-#include "zend_timer.h"
-
 #ifdef ZEND_TIMER
 
 #include <stdio.h>

Zend/zend_timer.h

@@ -17,18 +17,13 @@
 #ifndef ZEND_TIMER_H
 #define ZEND_TIMER_H
 
-#ifdef __linux__
-#include "php_config.h"
-
-#  if defined(ZTS) && defined(HAVE_TIMER_CREATE)
-#define ZEND_TIMER 1
+# ifdef ZEND_TIMER
 
 #include "zend_long.h"
 
 ZEND_API void zend_timer_create(void);
 ZEND_API void zend_timer_settime(zend_long seconds);
 ZEND_API void zend_timer_delete(void);
 
-#  endif
 # endif
 #endif

configure.ac

@@ -744,9 +744,6 @@ fi
 dnl Check for openpty. It may require linking against libutil or libbsd.
 PHP_CHECK_FUNC(openpty, util, bsd)
 
-dnl Check for timer_create
-PHP_CHECK_FUNC(timer_create, rt)
-
 dnl General settings.
 dnl ----------------------------------------------------------------------------
 PHP_CONFIGURE_PART(General settings)