From 95dd04d778f8ad36e7e06fec0410dec1f2e06bc0 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Mon, 1 Sep 2008 19:59:38 -0600
Subject: [PATCH] c-stack: make configure-time check more robust

* m4/c-stack.m4 (AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC): Check for
successful sigaction call.
Reported by Tom G. Christensen.

Signed-off-by: Eric Blake <ebb9@byu.net>
---
 ChangeLog     | 7 +++++++
 m4/c-stack.m4 | 8 +++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8d71a4be1..0277d1c5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-01  Eric Blake  <ebb9@byu.net>
+
+	c-stack: make configure-time check more robust
+	* m4/c-stack.m4 (AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC): Check for
+	successful sigaction call.
+	Reported by Tom G. Christensen.
+
 2008-09-01  Bruno Haible  <bruno@clisp.org>
 
 	New module 'findprog-lgpl'.
diff --git a/m4/c-stack.m4 b/m4/c-stack.m4
index 885b662867..4f0300bf7d 100644
--- a/m4/c-stack.m4
+++ b/m4/c-stack.m4
@@ -7,7 +7,7 @@
 
 # Written by Paul Eggert.
 
-# serial 5
+# serial 6
 
 AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
   [# for STACK_DIRECTION
@@ -85,8 +85,7 @@ AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
 	   setrlimit (RLIMIT_STACK, &rl);
 	   #endif
 
-	   c_stack_action ();
-	   return recurse ("\1");
+	   return c_stack_action () || recurse ("\1");
 	 }
 	],
 	[ac_cv_sys_stack_overflow_works=yes],
@@ -201,8 +200,7 @@ AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
 	   setrlimit (RLIMIT_STACK, &rl);
 	   #endif
 
-	   c_stack_action ();
-	   return recurse ("\1");
+	   return c_stack_action () || recurse ("\1");
 	 }
 	],
 	[ac_cv_sys_xsi_stack_overflow_heuristic=yes],
-- 
2.30.2