From 63630a34699453d6e80336989ed88a9376192c73 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Oct 2024 21:10:30 +0200 Subject: [PATCH] regex: Avoid dialog while running configure test on Haiku/x86_64. Reported by Alexandru Popa in . * m4/regex.m4 (gl_REGEX): Disable dialog upon abort on Haiku. --- ChangeLog | 7 +++++++ m4/regex.m4 | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f3955670c..cdb91b09e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-26 Bruno Haible + + regex: Avoid dialog while running configure test on Haiku/x86_64. + Reported by Alexandru Popa in + . + * m4/regex.m4 (gl_REGEX): Disable dialog upon abort on Haiku. + 2024-10-26 Bruno Haible regex: Make configure test more maintainable. diff --git a/m4/regex.m4 b/m4/regex.m4 index 8e1b79196d..c1c3757ea0 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,5 +1,5 @@ # regex.m4 -# serial 76 +# serial 77 dnl Copyright (C) 1996-2001, 2003-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -43,12 +43,12 @@ AC_DEFUN([gl_REGEX], # include /* defines M_CHECK_ACTION on glibc */ #endif - #if defined M_CHECK_ACTION || HAVE_DECL_ALARM + #if defined __HAIKU__ || defined M_CHECK_ACTION || HAVE_DECL_ALARM # include # include #endif - #ifdef M_CHECK_ACTION + #if defined __HAIKU__ || defined M_CHECK_ACTION /* Exit with distinguishable exit code. */ static void sigabrt_no_core (int sig) { raise (SIGTERM); } #endif @@ -67,6 +67,9 @@ AC_DEFUN([gl_REGEX], signal (SIGALRM, SIG_DFL); alarm (2); #endif +#ifdef __HAIKU__ + signal (SIGABRT, sigabrt_no_core); +#endif #ifdef M_CHECK_ACTION signal (SIGABRT, sigabrt_no_core); mallopt (M_CHECK_ACTION, 2); -- 2.39.5