X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsignalblocking.m4;h=99a0d5475aa02d5593bcd0bd2e4753964587bf01;hb=9e8ce574adfade2243a6141a1655addb92512aeb;hp=1a88f52fd6f06bc3d5c67adc8b3c6e7a18c39925;hpb=40b33d9d6c32cd1afac372a5da2b002aac5a881d;p=gnulib.git

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index 1a88f52fd..99a0d5475 100644
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,23 +1,43 @@
-# signalblocking.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# signalblocking.m4 serial 5
+dnl Copyright (C) 2001-2002, 2006-2007 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.
 
 # Determine available signal blocking primitives. Three different APIs exist:
 # 1) POSIX: sigemptyset, sigaddset, sigprocmask
 # 2) SYSV: sighold, sigrelse
 # 3) BSD: sigblock, sigsetmask
 # For simplicity, here we check only for the POSIX signal blocking.
-AC_DEFUN([gt_SIGNALBLOCKING],
+AC_DEFUN([gl_SIGNALBLOCKING],
 [
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
   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,
-      AC_DEFINE(HAVE_POSIX_SIGNALBLOCKING, 1,
-       [Define to 1 if you have the sigset_t type and the sigprocmask function.]))
+    AC_CHECK_FUNC(sigprocmask, [gl_cv_func_sigprocmask=1])
   fi
+  if test -z "$gl_cv_func_sigprocmask"; then
+    HAVE_POSIX_SIGNALBLOCKING=0
+    AC_LIBOBJ([sigprocmask])
+    gl_PREREQ_SIGPROCMASK
+  fi
+])
+
+# Prerequisites of the part of lib/signal_.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])
+  AC_CHECK_FUNCS_ONCE(raise)
 ])