From ba4b91abd5dbe486c71465b0968aa1a4a1198bd7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 10 Jan 2020 23:44:18 +0100 Subject: [PATCH] Fix major regression from 2020-01-04. Reported by Mats Erik Andersson in . * m4/00gnulib.m4 (gl_COMPILER_PREPARE_CHECK_DECL): Define through AC_DEFUN_ONCE. (AC_CHECK_DECL): Invoke, not require, it. --- ChangeLog | 9 +++++++++ m4/00gnulib.m4 | 11 ++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5231622af..1193d2209d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2020-01-10 Bruno Haible + + Fix major regression from 2020-01-04. + Reported by Mats Erik Andersson in + . + * m4/00gnulib.m4 (gl_COMPILER_PREPARE_CHECK_DECL): Define through + AC_DEFUN_ONCE. + (AC_CHECK_DECL): Invoke, not require, it. + 2020-01-10 Bruno Haible c32snrtombs: Add tests. diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 77503eab16..58bc4efb9c 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,4 +1,4 @@ -# 00gnulib.m4 serial 4 +# 00gnulib.m4 serial 5 dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -62,7 +62,7 @@ barfbarf [gl_cv_compiler_clang=no]) ]) ]) -AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL], +AC_DEFUN_ONCE([gl_COMPILER_PREPARE_CHECK_DECL], [ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gl_COMPILER_CLANG]) @@ -95,10 +95,11 @@ m4_define([_AC_CHECK_DECL_BODY], m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_save_ac_compile" ]) ]) -dnl Redefine AC_CHECK_DECL so that it starts with -dnl AC_REQUIRE([gl_COMPILER_PREPARE_CHECK_DECL]). +dnl Redefine AC_CHECK_DECL so that it starts with an invocation of +dnl gl_COMPILER_PREPARE_CHECK_DECL. m4_define([AC_CHECK_DECL], - [AC_REQUIRE([gl_COMPILER_PREPARE_CHECK_DECL])]m4_defn([AC_CHECK_DECL])) + [gl_COMPILER_PREPARE_CHECK_DECL dnl +]m4_defn([AC_CHECK_DECL])) # gl_00GNULIB # ----------- -- 2.39.5