diff --git a/configure.ac b/configure.ac
index 420021f628ab81d61a4e898fe1acdc6c3d173f2a..2e55bc70d687a162cdb61a5969f90c2a299e80c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl Testing.
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
- [build_testing="yes"], [build_testing="no"])
+ [unit_tests="yes"], [unit_tests="no"])
AC_CHECK_HEADERS(libgen.h)
fi
AC_SUBST([A2X])
+integration_tests="yes"
+AC_PATH_PROG([VALGRIND], [valgrind])
+if test "x$VALGRIND" = "x"; then
+ integration_tests="no (missing valgrind)"
+fi
+AM_CONDITIONAL([INTEGRATION_TESTING], test "x$integration_tests" = "xyes")
+
dnl Plugin checks.
puppet_storeconfigs_default=$with_libdbi
if test "x$puppet_storeconfigs_default" != "xyes"; then
[plugin logging to syslog])
AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes")
-AM_CONDITIONAL([BUILD_TESTING], test "x$build_testing" = "xyes")
+AM_CONDITIONAL([UNIT_TESTING], test "x$unit_tests" = "xyes")
AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile
src/liboconfig/Makefile t/Makefile])
AC_MSG_RESULT()
AC_MSG_RESULT([ Features:])
AC_MSG_RESULT([ documentation: . . . . . . $build_documentation])
-AC_MSG_RESULT([ unit testing: . . . . . . . $build_testing])
+AC_MSG_RESULT([ unit testing: . . . . . . . $unit_tests])
AC_MSG_RESULT([ stdio mocking: . . . . . $have_fopencookie])
AC_MSG_RESULT([ coverage testing: . . . . . $enable_gcov])
+AC_MSG_RESULT([ integration testing: . . . $integration_tests])
AC_MSG_RESULT()
AC_MSG_RESULT([ Libraries:])
AC_MSG_RESULT([ libdbi: . . . . . . . . . . $with_libdbi])