X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=configure.ac;h=e395d5f1b0408e600e8f483277a6fff0c81bdf23;hp=ef6868e7bab7509c129a75fde51afcf83028b2f3;hb=73b11c814814e5343ccb66c9a7b45f634b02b07f;hpb=d289c0a9d042a06acc60d4d8d915787268f25bb2

diff --git a/configure.ac b/configure.ac
index ef6868e..e395d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
 		[sysdb@sysdb.io],
 		[sysdb],
-		[http://sysdb.io/])
+		[https://sysdb.io/])
 PACKAGE_MAINTAINER="Sebastian 'tokkee' Harl <tokkee@sysdb.io>"
 AC_DEFINE_UNQUOTED([PACKAGE_MAINTAINER], ["$PACKAGE_MAINTAINER"],
 		[Define to the name of the maintainer of this package.])
@@ -422,6 +422,10 @@ else
 	AC_MSG_ERROR([Invalid value for option --with-librrd=$with_librrd (expected "yes", "no", or "auto")])
 fi; fi
 
+if test "x$have_librrd" = "xyes"; then
+	AC_CHECK_HEADERS([rrd_client.h])
+fi
+
 dnl Feature checks.
 build_documentation="yes"
 
@@ -455,12 +459,16 @@ puppet_storeconfigs_default=$with_libdbi
 if test "x$puppet_storeconfigs_default" != "xyes"; then
 	puppet_storeconfigs_default="no (requires libdbi)"
 fi
+rrdtool_default=$have_librrd
+if test "x$rrdtool_default" != "xyes"; then
+	rrdtool_default="no (required librrd)"
+fi
 
 m4_divert_once([HELP_ENABLE], [
 Backends:])
 
 AC_SDB_PLUGIN_INIT
-AC_SDB_PLUGIN([collectd], [yes],
+AC_SDB_PLUGIN([collectd-unixsock], [yes],
 		[backend accessing the system statistics collection daemon])
 AC_SDB_PLUGIN([mk-livestatus], [yes],
 		[backend accessing Nagios/Icinga/Shinken using MK Livestatus])
@@ -469,7 +477,7 @@ AC_SDB_PLUGIN([puppet-storeconfigs], [$puppet_storeconfigs_default],
 
 m4_divert_once([HELP_ENABLE], [
 Time-series fetchers:])
-AC_SDB_PLUGIN([rrdtool], [$have_librrd],
+AC_SDB_PLUGIN([timeseries-rrdtool], [$rrdtool_default],
 		[fetch time-series data from RRD files])
 
 m4_divert_once([HELP_ENABLE], [
@@ -519,12 +527,12 @@ AC_MSG_RESULT([    libreadline:  . . . . . . . $have_libreadline])
 AC_MSG_RESULT([    librrd: . . . . . . . . . . $have_librrd])
 AC_MSG_RESULT()
 AC_MSG_RESULT([  Backends:])
-AC_MSG_RESULT([    collectd: . . . . . . . . . $enable_collectd])
+AC_MSG_RESULT([    collectd::unixsock: . . . . $enable_collectd_unixsock])
 AC_MSG_RESULT([    mk-livestatus:  . . . . . . $enable_mk_livestatus])
-AC_MSG_RESULT([    puppet-storeconfigs:  . . . $enable_puppet_storeconfigs])
+AC_MSG_RESULT([    puppet::storeconfigs: . . . $enable_puppet_storeconfigs])
 AC_MSG_RESULT()
 AC_MSG_RESULT([  Time-series fetchers:])
-AC_MSG_RESULT([    rrdtool:  . . . . . . . . . $enable_rrdtool])
+AC_MSG_RESULT([    rrdtool:  . . . . . . . . . $enable_timeseries_rrdtool])
 AC_MSG_RESULT()
 AC_MSG_RESULT([  Plugins:])
 AC_MSG_RESULT([    cname::dns: . . . . . . . . $enable_cname_dns])