X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsignalblocking.m4;h=4459815a6c223f1cee0393c0fdfff11395521353;hb=9f737c8fda7811e7572c6c8525459a89ef27c7ef;hp=2c03df49e15c2c797f2bf01c9463b8c29943832c;hpb=a692f46090d747c7e763b8f75f17bad6768601b2;p=gnulib.git

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index 2c03df49e..4459815a6 100644
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 4
-dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
+# signalblocking.m4 serial 10
+dnl Copyright (C) 2001-2002, 2006-2010 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,32 @@ 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],
 [
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
   signals_not_posix=
-  AC_EGREP_HEADER(sigset_t, signal.h, , signals_not_posix=1)
+  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_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
+  if test -z "$gl_cv_func_sigprocmask"; then
+    HAVE_POSIX_SIGNALBLOCKING=0
     AC_LIBOBJ([sigprocmask])
     gl_PREREQ_SIGPROCMASK
   fi
 ])
 
-# Prerequisites of lib/sigprocmask.h and lib/sigprocmask.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [
+# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c.
+AC_DEFUN([gl_PREREQ_SIGPROCMASK],
+[
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
   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.])
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
   fi
-  AC_CHECK_FUNCS_ONCE(raise)
+  dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has
+  dnl the sigset_t type.
+  AC_SUBST([HAVE_SIGSET_T])
 ])