From ce1fa85015a6dabec92220077302e24fbccce768 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 22 Sep 2008 00:47:13 +0200
Subject: [PATCH] Make autoconf tests structure consistent with source files in
 lib/.

---
 ChangeLog       |  7 +++++++
 m4/sigaction.m4 | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acf9b88b7..cad2082dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-09-21  Bruno Haible  <bruno@clisp.org>
 
+	* m4/sigaction.m4 (gl_SIGACTION): Remove unnecessary AC_SUBST. Check
+	whether 'struct sigaction' has sa_sigaction here...
+	(gl_PREREQ_SIG_HANDLER_H): ... not here.
+	(gl_PREREQ_SIGACTION): Remove unnecessary AC_SUBST.
+
+2008-09-21  Bruno Haible  <bruno@clisp.org>
+
 	* MODULES.html.sh (Support for obsolete systems lacking ANSI C 89): New
 	section.
 	(Support for systems lacking ANSI C 89): Move stdlib, exit, strtol,
diff --git a/m4/sigaction.m4 b/m4/sigaction.m4
index f11d4cf0f..3a3ed9f24 100644
--- a/m4/sigaction.m4
+++ b/m4/sigaction.m4
@@ -1,4 +1,4 @@
-# sigaction.m4 serial 4
+# sigaction.m4 serial 5
 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,
@@ -8,10 +8,16 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_SIGACTION],
 [
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REPLACE_FUNCS([sigaction])
-  if test $ac_cv_func_sigaction = no ; then
+  AC_CHECK_FUNCS_ONCE([sigaction])
+  if test $ac_cv_func_sigaction = yes; then
+    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
+    fi
+  else
     HAVE_SIGACTION=0
-    AC_SUBST([HAVE_SIGACTION])
+    AC_LIBOBJ([sigaction])
     gl_PREREQ_SIGACTION
   fi
 ])
@@ -29,7 +35,6 @@ AC_DEFUN([gl_PREREQ_SIGACTION],
   ]])
   if test $ac_cv_type_siginfo_t = no; then
     HAVE_SIGINFO_T=0
-    AC_SUBST([HAVE_SIGINFO_T])
   fi
 ])
 
@@ -37,10 +42,4 @@ 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
 ])
-- 
2.11.0