gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / signalblocking.m4

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index bb120f5..a00e704 100644 (file)
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 2 (gettext-0.15.1)
-dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
+# signalblocking.m4 serial 14
+dnl Copyright (C) 2001-2002, 2006-2013 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.
@@ -11,21 +11,15 @@ dnl with or without modifications, as long as this notice is preserved.
 # For simplicity, here we check only for the POSIX signal blocking.
 AC_DEFUN([gl_SIGNALBLOCKING],
 [
-  signals_not_posix=
-  AC_EGREP_HEADER(sigset_t, signal.h, , signals_not_posix=1)
-  if test -z "$signals_not_posix"; then
-    AC_CHECK_FUNC(sigprocmask, [gl_cv_func_sigprocmask=1])
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
+  if test $gl_cv_type_sigset_t = yes; then
+    AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1])
   fi
-  if test -n "$gl_cv_func_sigprocmask"; then
-    AC_DEFINE([HAVE_POSIX_SIGNALBLOCKING], 1,
-      [Define to 1 if you have the sigset_t type and the sigprocmask function.])
-  else
-    AC_LIBOBJ([sigprocmask])
-    gl_PREREQ_SIGPROCMASK
+  if test -z "$gl_cv_func_sigprocmask"; then
+    HAVE_POSIX_SIGNALBLOCKING=0
   fi
 ])
 
 # Prerequisites of lib/sigprocmask.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [
-  AC_CHECK_FUNCS_ONCE(raise)
-])
+AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])