X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fsignalblocking.m4;h=ab8035efb75c73757d52e471a4e598bd5c109dad;hb=a0dccde75e6a3b9c930e3577fae7a5bf9351ec09;hp=82b0404c4c0e887add6486bd3773b41841cdc5bb;hpb=42d1eda5dcce2d68deab7a642e7f29bcd7144a0d;p=gnulib.git

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index 82b0404c4..ab8035efb 100644
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 10
-dnl Copyright (C) 2001-2002, 2006-2009 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.
@@ -12,31 +12,16 @@ dnl with or without modifications, as long as this notice is preserved.
 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_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 -z "$gl_cv_func_sigprocmask"; then
     HAVE_POSIX_SIGNALBLOCKING=0
-    AC_LIBOBJ([sigprocmask])
-    gl_PREREQ_SIGPROCMASK
   fi
 ])
 
-# 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])
+# Prerequisites of lib/sigprocmask.c.
+AC_DEFUN([gl_PREREQ_SIGPROCMASK], [
+  AC_REQUIRE([AC_C_INLINE])
 ])