Merge from emacs-24

[gnu-emacs] / m4 / signalblocking.m4

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index 15b74253ba6dd6c57d7a492f496226bb170b5eb3..ab8035efb75c73757d52e471a4e598bd5c109dad 100644 (file)
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 12
-dnl Copyright (C) 2001-2002, 2006-2011 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.
@@ -22,4 +22,6 @@ AC_DEFUN([gl_SIGNALBLOCKING],
 ])
 
 # Prerequisites of lib/sigprocmask.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])
+AC_DEFUN([gl_PREREQ_SIGPROCMASK], [
+  AC_REQUIRE([AC_C_INLINE])
+])