From 1a890c291972284b13e7ae9d394813f2a138fed0 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 22 Nov 2014 12:21:10 -0500 Subject: [PATCH] Fix distribution of dx-stamp.m4. The automatic distribution of dx-stamp.m4 depends on m4_include appearing in the m4 traces. Normally aclocal does that but it seems to not be entirely reliable. The reason we do not simply use m4_include is because this produces warnings about multiple inclusion. Fortunately, this is pretty easy to work around. Just use m4_pushdef to redefine m4_include to what we need, so the traces show the file needs to be distributed. --- m4/base.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/m4/base.m4 b/m4/base.m4 index 5be583c..aebf6cd 100644 --- a/m4/base.m4 +++ b/m4/base.m4 @@ -31,7 +31,9 @@ m4_define([_DX_BASEDIR], m4_if([$1], [], dnl Include the stamp file, which will cause a failure at autoconf time dnl if it does not exist in the checkout. We circumvent m4_include to dnl avoid warnings about multiple inclusions. -m4_builtin([include], m4_defn([_DX_BASEDIR])[/m4/dx-stamp.m4]) +m4_pushdef([m4_include], [m4_builtin([include], $][@)]) +m4_include(m4_defn([_DX_BASEDIR])[/m4/dx-stamp.m4]) +m4_popdef([m4_include]) _DX_STAMP_DUMMY dnl Autoconf scripts should use the DX_BASEDIR m4 macro instead of the -- 2.43.0