From 1860f00aee5935b1698337170e9e9d729768c7b9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Oct 2024 20:58:05 +0200 Subject: [PATCH] regex: Make configure test more maintainable. * m4/regex.m4 (gl_REGEX): Include before testing for M_CHECK_ACTION. --- ChangeLog | 6 ++++++ m4/regex.m4 | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84fd37e445..2f3955670c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-10-26 Bruno Haible + + regex: Make configure test more maintainable. + * m4/regex.m4 (gl_REGEX): Include before testing for + M_CHECK_ACTION. + 2024-10-26 Bruno Haible pipe-filter-gi: Correct documentation. diff --git a/m4/regex.m4 b/m4/regex.m4 index f0101fe67c..8e1b79196d 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,5 +1,5 @@ # regex.m4 -# serial 75 +# serial 76 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, @@ -39,15 +39,15 @@ AC_DEFUN([gl_REGEX], #include #include + #if HAVE_MALLOC_H + # include /* defines M_CHECK_ACTION on glibc */ + #endif + #if defined M_CHECK_ACTION || HAVE_DECL_ALARM # include # include #endif - #if HAVE_MALLOC_H - # include - #endif - #ifdef M_CHECK_ACTION /* Exit with distinguishable exit code. */ static void sigabrt_no_core (int sig) { raise (SIGTERM); } -- 2.39.5