diff options
author | Ryan Lortie <desrt@desrt.ca> | 2015-05-27 08:16:18 -0400 |
---|---|---|
committer | Ryan Lortie <desrt@desrt.ca> | 2015-05-27 08:16:18 -0400 |
commit | c0f3c75e01ee82d6e042dd813248dd418c3da467 (patch) | |
tree | 2f13ff199ff354fbe320129ce6e2f717e7d22816 /Makefile.am | |
parent | 1522f1f55b5b95a1ac8e9577fb755b9c7b1d74e4 (diff) | |
download | m4-common-c0f3c75e01ee82d6e042dd813248dd418c3da467.tar.gz |
Makefile: work around AX_REQUIRE_DEFINED problem
We check to make sure that we properly include all needed .m4 files that
are used from other .m4 files we install by building a list of all
references and checking to make sure those are all actually defined.
This has been tripped up by this macro definition in
ax_compiler_flags.m4:
m4_defun([_AX_COMPILER_FLAGS_LANG],
[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [],
[m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl
AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl
])
which tries to depend on a macro with a name calculated from its
argument.
Our simple regexp matching decides that AX_COMPILER_FLAGS_ is the name
of the required macro here, and that is not defined anywhere, so the
build fails.
Update the regexp not to match macro names ending with an underscore in
order to work around the issue for now.
I tried to use m4 to expand the file, but it seems that it doesn't work
because the invocations are protected by the [quoting] used in AC_-style
macro invocations. Maybe we can find a better way to fix this in the
future, but this approach works for now.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index cd441d8..8dbbd97 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ dist_aclocal_DATA = \ $(NULL) all-local: $(dist_aclocal_DATA) - cat $^ | grep -v '^#' | sed -e 's/\<dnl\>.*//' | grep -o '\<AX_[A-Z0-9_]*\>' | sort | uniq > used + cat $^ | grep -v '^#' | sed -e 's/\<dnl\>.*//' | grep -o '\<AX_[A-Z0-9_]*[A-Z0-9]\>' | sort | uniq > used cat $^ | grep ^AC_DEFUN | grep -o '\<AX_[A-Z0-9_]*\>' | sort | uniq > defined diff -u used defined rm -f used defined |