X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=e967867e68c6baadc6faf4bf42f8841a4c0d488b;hb=be63d81ac212b97d79b478634dc86c141992cef8;hp=fac681dc116fa66328ae29bf834d25cbf6e23486;hpb=bef7167f0dc1fd405e35d5cbffb3c0820945a9ea;p=sysdb.git

diff --git a/configure.ac b/configure.ac
index fac681d..e967867 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
 		[sh@tokkee.org],
-		[SysDB],
+		[sysdb],
 		[http://git.tokkee.org/?p=sysdb.git])
 PACKAGE_MAINTAINER="Sebastian 'tokkee' Harl <sh@tokkee.org>"
 AC_DEFINE_UNQUOTED([PACKAGE_MAINTAINER], ["$PACKAGE_MAINTAINER"],
@@ -171,8 +171,7 @@ if test "x$enable_strict_checks" = "xyes"; then
 			-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
@@ -207,6 +206,13 @@ AM_CONDITIONAL([BUILD_WITH_LIBDBI], test "x$with_libdbi" = "xyes")
 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
@@ -223,9 +229,9 @@ fi
 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], [
@@ -236,7 +242,7 @@ AC_SDB_PLUGIN([collectd], [yes],
 		[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")
@@ -260,7 +266,7 @@ AC_MSG_RESULT([  build date: $BUILD_DATE])
 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])