X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=configure.ac;h=2e55bc70d687a162cdb61a5969f90c2a299e80c8;hp=a5226d278500b27048748ce77fcedbca63faaf99;hb=cedd242274a762dfb8d8efa530a0bbb3d16446a5;hpb=cb62073c4a4b514f2144d73f8197d9dff357cece

diff --git a/configure.ac b/configure.ac
index a5226d2..2e55bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,8 @@ test_cc_flags() {
 	return $ret
 }
 
+STRICT_CFLAGS=""
+
 m4_divert_once([HELP_ENABLE], [
 Build options:])
 
@@ -94,8 +96,8 @@ if test "x$enable_standards" = "xyes"; then
 			[Define to enforce ISO/IEC 9899:1999 (C99) compliance.])
 	AC_DEFINE([_POSIX_C_SOURCE], 200112L,
 			[Define to enforce IEEE 1003.1-2001 (POSIX:2001) compliance.])
-	AC_DEFINE([_XOPEN_SOURCE], 600,
-			[Define to enforce X/Open 6 (XSI) compliance.])
+	AC_DEFINE([_XOPEN_SOURCE], 700,
+			[Define to enforce X/Open 7 (XSI) compliance.])
 	AC_DEFINE([_REENTRANT], 1,
 			[Define to enable reentrant interfaces.])
 	AC_DEFINE([_THREAD_SAFE], 1,
@@ -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])
 
@@ -168,11 +169,13 @@ for flag in -Wall -Werror; do
 done
 
 if test "x$enable_strict_checks" = "xyes"; then
+	dnl -Wsign-conversion may cause problems in expanded macros from libc
 	for flag in -Wextra \
 			-Wbad-function-cast \
 			-Wcast-align \
 			-Wcast-qual \
 			-Wconversion \
+			-Wno-sign-conversion \
 			-Wdeclaration-after-statement \
 			-Wmissing-prototypes \
 			-Wpointer-arith \
@@ -250,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)
 
@@ -393,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
@@ -419,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])
@@ -444,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])