c-stack: fix regression on Irix 5.3 from 2008-06-21

* m4/c-stack.m4 (gl_PREREQ_C_STACK): Move check for
sa_sigaction...
* m4/sigaction.m4 (gl_PREREQ_SIG_HANDLER_H): ...here.
(gl_PREREQ_SIGACTION): Depend on sig-handler.h prereq's.
* m4/signal_h.m4 (gl_SIGNAL_H_DEFAULTS): Set the default.
* modules/signal (Makefile.am): Use the value.
* lib/signal.in.h (sa_sigaction) [HAVE_SIGACTION
&& !HAVE_STRUCT_SIGACTION_SA_SIGACTION]: Define.
* doc/posix-headers/signal.texi (signal.h): Document this
portability issue.
* doc/posix-functions/sigaction.texi (sigaction): Likewise.
Reported by Tom G. Christensen.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 2ec2e879dffd6045fe2d7c7f7d4f078296e09129..062b03ec09e87741f1ee1a7ce53a1ad330dc7b14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-08-16  Eric Blake  <ebb9@byu.net>
+
+       c-stack: fix regression on Irix 5.3 from 2008-06-21
+       * m4/c-stack.m4 (gl_PREREQ_C_STACK): Move check for
+       sa_sigaction...
+       * m4/sigaction.m4 (gl_PREREQ_SIG_HANDLER_H): ...here.
+       (gl_PREREQ_SIGACTION): Depend on sig-handler.h prereq's.
+       * m4/signal_h.m4 (gl_SIGNAL_H_DEFAULTS): Set the default.
+       * modules/signal (Makefile.am): Use the value.
+       * lib/signal.in.h (sa_sigaction) [HAVE_SIGACTION
+       && !HAVE_STRUCT_SIGACTION_SA_SIGACTION]: Define.
+       * doc/posix-headers/signal.texi (signal.h): Document this
+       portability issue.
+       * doc/posix-functions/sigaction.texi (sigaction): Likewise.
+       Reported by Tom G. Christensen.
+
 2008-08-17  Bruno Haible  <bruno@clisp.org>
 
        New module 'threadlib'.

diff --git a/doc/posix-functions/sigaction.texi b/doc/posix-functions/sigaction.texi
index 56795d900653fe726f206a949c6470d3ff273b10..c48519a67a807c97149d6efdc15693b268cce34c 100644 (file)
--- a/doc/posix-functions/sigaction.texi
+++ b/doc/posix-functions/sigaction.texi
@@ -36,6 +36,11 @@ mingw.
 Support for SA_RESTART is missing on some platforms:
 mingw.
 
+@item
+In spite of having SA_SIGACTION, struct sigaction lacks the
+sa_sigaction member on some platforms:
+Irix 5.3.
+
 @item
 The symbolic value @code{SIG_IGN} for the @code{SIGCHLD} signal is equivalent
 to a signal handler

diff --git a/doc/posix-headers/signal.texi b/doc/posix-headers/signal.texi
index cb4f580e89ecb9c2af4294a626c8ef160ca23804..924408992f0fbe657f9b1f9f83745f0b4b068c41 100644 (file)
--- a/doc/posix-headers/signal.texi
+++ b/doc/posix-headers/signal.texi
@@ -15,12 +15,13 @@ mingw.
 @code{struct sigaction} and @code{siginfo_t} are missing on some
 platforms:
 mingw.
+
+@item
+@code{struct sigaction} lacks the @code{sa_sigaction} member on some
+platforms:
+Irix 5.3, Interix 3.5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
-@item
-@code{struct sigaction} lacks the @code{sa_sigaction} member on some
-platforms; this can also be detected by whether @code{SA_SIGINFO} is defined:
-Interix 3.5.
 @end itemize

diff --git a/lib/signal.in.h b/lib/signal.in.h
index 703437d55f40fed66730bc37f1271de3d278e351..7df5d5f71b1bb9787e32f40cb453a662294e9f27 100644 (file)
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -146,7 +146,11 @@ struct sigaction
 extern int sigaction (int, const struct sigaction *restrict,
                       struct sigaction *restrict);
 
-#endif /* !@HAVE_SIGACTION@ */
+#elif !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@
+
+# define sa_sigaction sa_handler
+
+#endif /* !@HAVE_SIGACTION@, !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@ */
 
 
 #ifdef __cplusplus

diff --git a/m4/c-stack.m4 b/m4/c-stack.m4
index b1f93eda8e502f1396eeeb749f38fa301f7fe6dc..1db2a5065d22a63d12b2b09d6630c39900dbe7a1 100644 (file)
--- a/m4/c-stack.m4
+++ b/m4/c-stack.m4
@@ -7,7 +7,7 @@
 
 # Written by Paul Eggert.
 
-# serial 3
+# serial 4
 
 AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
   [# for STACK_DIRECTION
@@ -146,8 +146,6 @@ AC_DEFUN([gl_PREREQ_C_STACK],
 
    AC_CHECK_HEADERS_ONCE([unistd.h ucontext.h])
 
-   AC_CHECK_MEMBERS([struct sigaction.sa_sigaction], , , [#include <signal.h>])
-
    AC_CHECK_TYPES([stack_t], , , [#include <signal.h>])
 
    dnl c-stack does not need -lsigsegv if the system has XSI heuristics.

diff --git a/m4/sigaction.m4 b/m4/sigaction.m4
index 790116a04471eab5f76458bc7f458336fa9ca214..f11d4cf0f17c77d7aad359c129895762199829f2 100644 (file)
--- a/m4/sigaction.m4
+++ b/m4/sigaction.m4
@@ -1,4 +1,4 @@
-# sigaction.m4 serial 3
+# sigaction.m4 serial 4
 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,
@@ -22,6 +22,7 @@ AC_DEFUN([gl_PREREQ_SIGACTION],
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_TYPE_UID_T])
+  AC_REQUIRE([gl_PREREQ_SIG_HANDLER_H])
   AC_CHECK_FUNCS_ONCE([sigaltstack siginterrupt])
   AC_CHECK_TYPES([siginfo_t], [], [], [[
 #include <signal.h>
@@ -36,5 +37,10 @@ AC_DEFUN([gl_PREREQ_SIGACTION],
 AC_DEFUN([gl_PREREQ_SIG_HANDLER_H],
 [
   AC_REQUIRE([AC_C_INLINE])
-  :
+  AC_CHECK_MEMBERS([struct sigaction.sa_sigaction], , ,
+                   [[#include <signal.h>]])
+  if test $ac_cv_member_struct_sigaction_sa_sigaction = no; then
+    HAVE_STRUCT_SIGACTION_SA_SIGACTION=0
+    AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
+  fi
 ])

diff --git a/m4/signal_h.m4 b/m4/signal_h.m4
index bf2bad41e6d72f5e264553ad9164931e9f040c73..0a105470890825df9d08b82a56e4541369823181 100644 (file)
--- a/m4/signal_h.m4
+++ b/m4/signal_h.m4
@@ -1,4 +1,4 @@
-# signal_h.m4 serial 4
+# signal_h.m4 serial 5
 dnl Copyright (C) 2007, 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,
@@ -26,4 +26,6 @@ AC_DEFUN([gl_SIGNAL_H_DEFAULTS],
   HAVE_SIGSET_T=1;             AC_SUBST([HAVE_SIGSET_T])
   HAVE_SIGINFO_T=1;            AC_SUBST([HAVE_SIGINFO_T])
   HAVE_SIGACTION=1;            AC_SUBST([HAVE_SIGACTION])
+  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
+                               AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
 ])

diff --git a/modules/signal b/modules/signal
index afe6ab3b41bc1b9eaddc89fcdd25a4261a32d740..c4fccc5f9861ffe2764c2f02e1a9198f77f3e3b6 100644 (file)
--- a/modules/signal
+++ b/modules/signal
@@ -28,6 +28,7 @@ signal.h: signal.in.h
              -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
              -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
              -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
+             -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/signal.in.h; \
        } > $@-t