Eric Blake wrote:
> it was failing to compile on mingw. Checking in this:
To keep the *.m4 macros in sync with the code, I'm committing this:
2008-06-23 Bruno Haible <[EMAIL PROTECTED]>
* m4/signalblocking.m4 (gl_PREREQ_SIG_HANDLER_H): Remove macro.
(gl_PREREQ_SIGPROCMASK): Don't invoke it.
* m4/sigaction.m4 (gl_PREREQ_SIG_HANDLER_H): New macro, moved here from
m4/signalblocking.m4.
(gl_PREREQ_SIGACTION): Don't invoke it.
* m4/nanosleep.m4 (gl_PREREQ_NANOSLEEP): Invoke
gl_PREREQ_SIG_HANDLER_H.
* m4/fatal-signal.m4 (gl_FATAL_SIGNAL): Likewise.
Don't check for sigaction here.
--- m4/fatal-signal.m4.orig 2008-06-23 22:40:02.000000000 +0200
+++ m4/fatal-signal.m4 2008-06-23 22:39:10.000000000 +0200
@@ -1,4 +1,4 @@
-# fatal-signal.m4 serial 5
+# fatal-signal.m4 serial 6
dnl Copyright (C) 2003-2004, 2006, 2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,5 +8,5 @@
[
AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T])
AC_CHECK_HEADERS_ONCE(unistd.h)
- AC_CHECK_FUNCS(sigaction)
+ gl_PREREQ_SIG_HANDLER_H
])
--- m4/nanosleep.m4.orig 2008-06-23 22:40:02.000000000 +0200
+++ m4/nanosleep.m4 2008-06-23 22:38:50.000000000 +0200
@@ -1,4 +1,4 @@
-#serial 24
+#serial 25
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -112,4 +112,5 @@
AC_DEFUN([gl_PREREQ_NANOSLEEP],
[
AC_CHECK_HEADERS_ONCE(sys/select.h)
+ gl_PREREQ_SIG_HANDLER_H
])
--- m4/sigaction.m4.orig 2008-06-23 22:40:02.000000000 +0200
+++ m4/sigaction.m4 2008-06-23 22:37:42.000000000 +0200
@@ -1,4 +1,4 @@
-# sigaction.m4 serial 2
+# sigaction.m4 serial 3
dnl Copyright (C) 2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -30,5 +30,11 @@
HAVE_SIGINFO_T=0
AC_SUBST([HAVE_SIGINFO_T])
fi
- gl_PREREQ_SIG_HANDLER_H
+])
+
+# Prerequisites of lib/sig-handler.h.
+AC_DEFUN([gl_PREREQ_SIG_HANDLER_H],
+[
+ AC_REQUIRE([AC_C_INLINE])
+ :
])
--- m4/signalblocking.m4.orig 2008-06-23 22:40:02.000000000 +0200
+++ m4/signalblocking.m4 2008-06-23 22:37:20.000000000 +0200
@@ -1,4 +1,4 @@
-# signalblocking.m4 serial 8
+# signalblocking.m4 serial 9
dnl Copyright (C) 2001-2002, 2006-2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -39,12 +39,4 @@
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])
- gl_PREREQ_SIG_HANDLER_H
-])
-
-# Prerequisites of lib/sig-handler.h.
-AC_DEFUN([gl_PREREQ_SIG_HANDLER_H],
-[
- AC_REQUIRE([AC_C_INLINE])
- :
])
