diff --git a/configure.ac b/configure.ac
index ac281225e0a703cb0478aa4a809f358bcf3360ff..5cae366f0e47b6d16ee649b491ae17d34a8e7d2c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
[AS_HELP_STRING([--with-libdbi], [libdbi support (default: auto)])],
[with_libdbi="$withval"],
[with_libdbi="yes"])
-if test "x$with_libdbi" = "xyes"; then
+if test "x$with_libdbi" = "xyes" || test "x$with_libdbi" = "xauto"; then
AC_CHECK_HEADERS([dbi/dbi.h],
[with_libdbi="yes"],
[with_libdbi="no (dbi/dbi.h not found)"])
-fi
+else if test "x$with_libdbi" = "xno"; then
+ with_libdbi="$with_libdbi (disabled on command-line)"
+else
+ AC_MSG_ERROR([Invalid value for option --with-libdbi=$with_libdbi (expected "yes", "no", or "auto")])
+fi; fi
if test "x$with_libdbi" = "xyes"; then
AC_CHECK_LIB([dbi], [dbi_initialize],
[with_libdbi="yes"],
if test "x$readline_support" = "xyes"; then
readline_support="auto"
-fi
+else if test "x$readline_support" != "xauto" \
+ && test "x$readline_support" != "xno" \
+ && test "x$readline_support" != "xlibedit" \
+ && test "x$readline_support" != "xlibreadline"; then
+ AC_MSG_ERROR([Invalid value for option --with-readline=$readline_support (expected "yes", "no", "auto", "libedit", or "libreadline")])
+fi; fi
have_libedit="no"
if test "x$readline_support" = "xauto" \
[backend accessing Nagios/Icinga/Shinken using MK Livestatus])
AC_SDB_PLUGIN([puppet-storeconfigs], [$puppet_storeconfigs_default],
[backend accessing the Puppet stored configuration database])
-AC_SDB_PLUGIN([syslog], [yes],
- [plugin logging to syslog])
+
+m4_divert_once([HELP_ENABLE], [
+Plugins:])
+
AC_SDB_PLUGIN([cname-dns], [yes],
[canonicalize hostnames by querying DNS])
+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")
AC_MSG_RESULT()
AC_MSG_RESULT([ Plugins:])
AC_MSG_RESULT([ cname::dns: . . . . . . . . $enable_cname_dns])
+AC_MSG_RESULT([ syslog: . . . . . . . . . . $enable_syslog])
AC_MSG_RESULT()
AC_MSG_RESULT([This package is maintained by $PACKAGE_MAINTAINER.])
AC_MSG_RESULT([Please report bugs to $PACKAGE_BUGREPORT.])