diff --git a/configure.ac b/configure.ac
index f765d5f56f9efe9edb8bfbc9b1a721e3d8e5f558..dfcb64fad94b97f47c03271adbe277b43fef08c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
-Wmissing-prototypes \
-Wpointer-arith \
-Wshadow \
-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
AC_MSG_CHECKING([whether $CC accepts $flag])
if test_cc_flags $flag; then
dnl Feature checks.
build_documentation="yes"
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
have_xsltproc="yes"
AC_PATH_PROG([XSLTPROC], [xsltproc])
if test "x$XSLTPROC" = "x"; then
dnl Plugin checks.
puppet_storeconfigs_default=$with_libdbi
dnl Plugin checks.
puppet_storeconfigs_default=$with_libdbi
-if test "x$puppet_storeconfigs_default" = "xno"; then
+if test "x$puppet_storeconfigs_default" != "xyes"; then
puppet_storeconfigs_default="no (requires libdbi)"
fi
puppet_storeconfigs_default="no (requires libdbi)"
fi
AC_MSG_RESULT()
AC_MSG_RESULT([ Tools:])
AC_MSG_RESULT([ AsciiDoc (a2x): . . . . . . $have_a2x])
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])
AC_MSG_RESULT()
AC_MSG_RESULT([ Features:])
AC_MSG_RESULT([ documentation: . . . . . . $build_documentation])