X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsignalblocking.m4;h=5ad8dbf8d6bcd0f150a5c0182a3c37146977e226;hb=ef51234c7d0d7fb58f507b093f2f1d8aa4b8ea4b;hp=bb120f55cc3cb697d846c06b2718ef1ca7e46529;hpb=fa9f85a436cb8239695046be4feb68211fe71af1;p=gnulib.git

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index bb120f55c..5ad8dbf8d 100644
--- 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 10
+dnl Copyright (C) 2001-2002, 2006-2011 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,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.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [
-  AC_CHECK_FUNCS_ONCE(raise)
+# 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
+    HAVE_SIGSET_T=0
+  fi
+  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])
 ])