changeset 39787:b71d1d82fd78

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.
author Bruno Haible <bruno@clisp.org>
date Tue, 14 Aug 2018 02:34:28 +0200
parents 3ef76443ad86
children c678d08c70c1
files ChangeLog m4/monetary_h.m4
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 14 02:29:23 2018 +0200
+++ b/ChangeLog	Tue Aug 14 02:34:28 2018 +0200
@@ -1,3 +1,9 @@
+2018-08-13  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	fnmatch, fnmatch-gnu: Fix compilation error on Mac OS X.
--- a/m4/monetary_h.m4	Tue Aug 14 02:29:23 2018 +0200
+++ b/m4/monetary_h.m4	Tue Aug 14 02:34:28 2018 +0200
@@ -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])])