diff --git a/configure.ac b/configure.ac
index fac681dc116fa66328ae29bf834d25cbf6e23486..dfcb64fad94b97f47c03271adbe277b43fef08c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
-Wmissing-prototypes \
-Wpointer-arith \
-Wshadow \
- -Wstrict-prototypes \
- -Wunreachable-code; do
+ -Wstrict-prototypes; do
AC_MSG_CHECKING([whether $CC accepts $flag])
if test_cc_flags $flag; then
dnl Feature checks.
build_documentation="yes"
+have_xmlto="yes"
+AC_PATH_PROG([XMLTO], [xmlto])
+if test "x$XMLTO" = "x"; then
+ have_xmlto="no"
+ build_documentation="no (missing xmlto)"
+fi
+
have_xsltproc="yes"
AC_PATH_PROG([XSLTPROC], [xsltproc])
if test "x$XSLTPROC" = "x"; then
AC_SUBST([A2X])
dnl Plugin checks.
-enable_puppet_storeconfigs=$with_libdbi
-if test "x$enable_puppet_storeconfigs" = "xno"; then
- enable_puppet_storeconfigs="no (requires libdbi)"
+puppet_storeconfigs_default=$with_libdbi
+if test "x$puppet_storeconfigs_default" != "xyes"; then
+ puppet_storeconfigs_default="no (requires libdbi)"
fi
m4_divert_once([HELP_ENABLE], [
[backend accessing the system statistics collection daemon])
AC_SDB_PLUGIN([mk-livestatus], [yes],
[backend accessing Nagios/Icinga/Shinken using MK Livestatus])
-AC_SDB_PLUGIN([puppet-storeconfigs], [$enable_puppet_storeconfigs],
+AC_SDB_PLUGIN([puppet-storeconfigs], [$puppet_storeconfigs_default],
[backend accessing the Puppet stored configuration database])
AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes")
AC_MSG_RESULT()
AC_MSG_RESULT([ Tools:])
AC_MSG_RESULT([ AsciiDoc (a2x): . . . . . . $have_a2x])
-AC_MSG_RESULT([ xsltproc: . . . . . . . . . $have_xsltproc])
+AC_MSG_RESULT([ xmlto / xsltproc: . . . . . $have_xmlto / $have_xsltproc])
AC_MSG_RESULT()
AC_MSG_RESULT([ Features:])
AC_MSG_RESULT([ documentation: . . . . . . $build_documentation])