zend build making sigjmp_buf and api check as mandatory.

all unixes support it since long time, the few which don't do not meet
the requirements to build php anyway (minix, dietlibc, ...).

Author: devnexen

Zend/Zend.m4

@@ -151,11 +151,40 @@ AC_CHECK_FUNCS(m4_normalize([
   pthread_stackseg_np
 ]))
 
-dnl Check for sigsetjmp. If it's defined as a macro, AC_CHECK_FUNCS won't work.
-AC_CHECK_FUNCS([sigsetjmp],,
-  [AC_CHECK_DECL([sigsetjmp],
-    [AC_DEFINE([HAVE_SIGSETJMP], [1])],,
-    [#include <setjmp.h>])])
+dnl
+dnl ZEND_CHECK_SIGSETJMP
+dnl
+dnl Check for sigsetjmp.
+dnl
+AC_DEFUN([ZEND_CHECK_SIGSETJMP],
+[AC_CACHE_CHECK([sigsetjmp availability whether as function or macro],
+[php_cv_have_sigsetjmp],
+[AC_RUN_IFELSE([AC_LANG_SOURCE([
+#include <setjmp.h>
+#include <signal.h>
+
+sigjmp_buf jmp;
+
+void handler(int s)
+{
+    siglongjmp(jmp, 1);
+}
+
+int main(void)
+{
+    signal(SIGTERM, handler);
+    (void)sigsetjmp(jmp, 1);
+    return 0;
+}
+])],
+  [php_cv_have_sigsetjmp=yes],
+  [php_cv_have_sigsetjmp=no],
+  [php_cv_have_sigsetjmp=no])])
+AS_VAR_IF([php_cv_have_sigsetjmp], [no],
+  [AC_MSG_ERROR([sigsetjmp check failed. Please, check config.log])],
+  [])
+])
+  
 
 ZEND_CHECK_STACK_DIRECTION
 ZEND_CHECK_FLOAT_PRECISION
@@ -197,6 +226,7 @@ if test "$ZEND_ZTS" = "yes"; then
   CFLAGS="$CFLAGS -DZTS"
 fi
 
+ZEND_CHECK_SIGSETJMP
 ZEND_CHECK_ALIGNMENT
 ZEND_CHECK_SIGNALS
 ZEND_CHECK_MAX_EXECUTION_TIMERS

Zend/zend_portability.h

@@ -394,15 +394,9 @@ char *alloca();
 # define XtOffsetOf(s_type, field) offsetof(s_type, field)
 #endif
 
-#ifdef HAVE_SIGSETJMP
-# define SETJMP(a) sigsetjmp(a, 0)
-# define LONGJMP(a,b) siglongjmp(a, b)
-# define JMP_BUF sigjmp_buf
-#else
-# define SETJMP(a) setjmp(a)
-# define LONGJMP(a,b) longjmp(a, b)
-# define JMP_BUF jmp_buf
-#endif
+#define SETJMP(a) sigsetjmp(a, 0)
+#define LONGJMP(a,b) siglongjmp(a, b)
+#define JMP_BUF sigjmp_buf
 
 #if ZEND_DEBUG
 # define ZEND_FILE_LINE_D				const char *__zend_filename, const uint32_t __zend_lineno