integration tests: Use LD_PRELOAD instead of chrpath.

[sysdb.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index de18e156b7f891616c76d24661314cba8ac70e7f..2e55bc70d687a162cdb61a5969f90c2a299e80c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,8 @@ test_cc_flags() {
        return $ret
 }
 
+STRICT_CFLAGS=""
+
 m4_divert_once([HELP_ENABLE], [
 Build options:])
 
@@ -106,11 +108,11 @@ if test "x$enable_standards" = "xyes"; then
        dnl strict standards compliance a bit to work around this.
        AC_DEFINE([_BSD_SOURCE], 1, [Define to enable 4.3BSD support.])
 
-       for flag in -std=c99 -pedantic; do
+       for flag in -std=c99; do
                AC_MSG_CHECKING([whether $CC accepts $flag])
 
                if test_cc_flags $flag; then
-                       CFLAGS="$CFLAGS $flag"
+                       STRICT_CFLAGS="$STRICT_CFLAGS $flag"
                        AC_MSG_RESULT([yes])
                else
                        AC_MSG_RESULT([no])
@@ -135,7 +137,7 @@ if test "x$enable_hardening" = "xyes"; then
                AC_MSG_CHECKING([whether $CC accepts $flag])
 
                if test_cc_flags $flag; then
-                       CFLAGS="$CFLAGS $flag"
+                       STRICT_CFLAGS="$STRICT_CFLAGS $flag"
                        hardening=$(($hardening + 1))
                        AC_MSG_RESULT([yes])
                else
@@ -155,7 +157,6 @@ AC_ARG_ENABLE([strict-checks],
                [enable_strict_checks="$enableval"],
                [enable_strict_checks="yes"])
 
-STRICT_CFLAGS=""
 for flag in -Wall -Werror; do
        AC_MSG_CHECKING([whether $CC accepts $flag])
 
@@ -252,7 +253,7 @@ Build dependencies:])
 
 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)
 
@@ -395,6 +396,13 @@ if test "x$A2X" = "x"; then
 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
@@ -421,7 +429,7 @@ AC_SDB_PLUGIN([syslog], [yes],
                [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])
@@ -446,9 +454,10 @@ AC_MSG_RESULT([    xmlto / xsltproc: . . . . . $have_xmlto / $have_xsltproc])
 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])