configure: Fix --disable-tests
Currently, we encounter errors when passing `--disable-tests` because
variables used for automake never get defined when you wrap
AX_CODE_COVERAGE and AX_VALGRIND in AS_IF statements. We can fix this by
ensuring that valgrind and code coverage are disabled when tests are
disabled but the autoconf macros are still present.
Tested:
Unit testing still works as expected and builds with --disable-tests
now succeed.
Change-Id: Iddf2db4625d6760455982f1a6fc136f57becd162
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/configure.ac b/configure.ac
index 6c39d32..46b9014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,14 +10,13 @@
# Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS
# It is important that this comes before AC_PROG_C{C,XX}, as we are attempting
# to stop them from populating default CFLAGS and CXXFLAGS.
-AS_IF([test "$enable_testing" != "xno"], [
- AS_IF([test "x$enable_code_coverage" = "xyes"], [
- AS_IF([test "x${CXXFLAGS+set}" != "xset"], [
- AC_SUBST(CXXFLAGS, [""])
- ])
- AS_IF([test "x${CFLAGS+set}" != "xset"], [
- AC_SUBST(CFLAGS, [""])
- ])
+AS_IF([test "x$enable_tests" = "xno"], [enable_code_coverage=no])
+AS_IF([test "x$enable_code_coverage" != "xno"], [
+ AS_IF([test "x${CXXFLAGS+set}" != "xset"], [
+ AC_SUBST(CXXFLAGS, [""])
+ ])
+ AS_IF([test "x${CFLAGS+set}" != "xset"], [
+ AC_SUBST(CFLAGS, [""])
])
])
@@ -147,21 +146,18 @@
])
# Check for valgrind
-AS_IF([test "x$enable_tests" != "xno"], [
- m4_foreach([vgtool], [valgrind_tool_list],
- [AX_VALGRIND_DFLT(vgtool, [off])])
- AX_VALGRIND_DFLT([memcheck], [on])
- AX_VALGRIND_CHECK
- AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
- m4_foreach([vgtool], [valgrind_tool_list],
- [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
-])
+AS_IF([test "x$enable_tests" = "xno"], [enable_valgrind=no])
+m4_foreach([vgtool], [valgrind_tool_list],
+ [AX_VALGRIND_DFLT(vgtool, [off])])
+AX_VALGRIND_DFLT([memcheck], [on])
+AX_VALGRIND_CHECK
+AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
+m4_foreach([vgtool], [valgrind_tool_list],
+ [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
# Code coverage
-AS_IF([test "x$enable_tests" != "xno"], [
- AX_CODE_COVERAGE
- AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage])
-])
+AX_CODE_COVERAGE
+AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage])
AC_ARG_ENABLE([oe-sdk],
AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])