diff --git a/configure.ac b/configure.ac
index de18e156b7f891616c76d24661314cba8ac70e7f..7b8d801dbb04c3b10c0b373074e18e781e94d448 100644 (file)
--- a/configure.ac
+++ b/configure.ac
return $ret
}
return $ret
}
+STRICT_CFLAGS=""
+
m4_divert_once([HELP_ENABLE], [
Build options:])
m4_divert_once([HELP_ENABLE], [
Build options:])
dnl strict standards compliance a bit to work around this.
AC_DEFINE([_BSD_SOURCE], 1, [Define to enable 4.3BSD support.])
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
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])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_CHECKING([whether $CC accepts $flag])
if test_cc_flags $flag; 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
hardening=$(($hardening + 1))
AC_MSG_RESULT([yes])
else
[enable_strict_checks="$enableval"],
[enable_strict_checks="yes"])
[enable_strict_checks="$enableval"],
[enable_strict_checks="yes"])
-STRICT_CFLAGS=""
for flag in -Wall -Werror; do
AC_MSG_CHECKING([whether $CC accepts $flag])
for flag in -Wall -Werror; do
AC_MSG_CHECKING([whether $CC accepts $flag])
dnl Testing.
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
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)
AC_CHECK_HEADERS(libgen.h)
fi
AC_SUBST([A2X])
fi
AC_SUBST([A2X])
+integration_tests="yes"
+AC_PATH_PROG([VALGRIND], [valgrind])
+AC_PATH_PROG([CHRPATH], [chrpath])
+if test "x$VALGRIND" = "x" || test "x$CHRPATH" = "x"; then
+ integration_tests="no (missing valgrind and/or chrpath)"
+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
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")
[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_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()
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([ 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])
AC_MSG_RESULT()
AC_MSG_RESULT([ Libraries:])
AC_MSG_RESULT([ libdbi: . . . . . . . . . . $with_libdbi])