X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsignalblocking.m4;h=ab8035efb75c73757d52e471a4e598bd5c109dad;hb=a0dccde75e6a3b9c930e3577fae7a5bf9351ec09;hp=55425481326ccb7e1dee6a490b09f1bde41934e0;hpb=d29acb6495707a7d24b815308109c43d71687c2c;p=gnulib.git

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index 554254813..ab8035efb 100644
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 4 (gettext-0.15.1)
-dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
+# signalblocking.m4 serial 13
+dnl Copyright (C) 2001-2002, 2006-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.
@@ -11,30 +11,17 @@ 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.h and lib/sigprocmask.c.
+# Prerequisites of lib/sigprocmask.c.
 AC_DEFUN([gl_PREREQ_SIGPROCMASK], [
-  AC_CHECK_TYPES([sigset_t],
-    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
-    [#include <signal.h>
-/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-#include <sys/types.h>])
-  if test $gl_cv_type_sigset_t = yes; then
-    AC_DEFINE([HAVE_SIGSET_T], [1],
-      [Define to 1 if you lack the sigprocmask function but have the sigset_t type.])
-  fi
-  AC_CHECK_FUNCS_ONCE(raise)
+  AC_REQUIRE([AC_C_INLINE])
 ])