From ad2d13eee51a0eac436d33df0e1f31e49e0bfaed Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 14 Aug 2018 02:34:28 +0200 Subject: [PATCH] monetary: Simplify m4 code. * m4/monetary_h.m4 (gl_MONETARY_H): Define through AC_DEFUN_ONCE. (gl_MONETARY_H_BODY): Inline into gl_MONETARY_H. Remove macro. --- ChangeLog | 6 ++++++ m4/monetary_h.m4 | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2da584e6fa..bcf7f6839a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-08-13 Bruno Haible + + monetary: Simplify m4 code. + * m4/monetary_h.m4 (gl_MONETARY_H): Define through AC_DEFUN_ONCE. + (gl_MONETARY_H_BODY): Inline into gl_MONETARY_H. Remove macro. + 2018-08-13 Bruno Haible fnmatch, fnmatch-gnu: Fix compilation error on Mac OS X. diff --git a/m4/monetary_h.m4 b/m4/monetary_h.m4 index 887ed91f67..c4ac3f712a 100644 --- a/m4/monetary_h.m4 +++ b/m4/monetary_h.m4 @@ -1,17 +1,10 @@ -# monetary_h.m4 serial 3 +# monetary_h.m4 serial 4 dnl Copyright (C) 2017-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_MONETARY_H], -[ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_MONETARY_H_BODY]) -]) - -AC_DEFUN([gl_MONETARY_H_BODY], +AC_DEFUN_ONCE([gl_MONETARY_H], [ AC_REQUIRE([gl_MONETARY_H_DEFAULTS]) m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) -- 2.39.5