From 51702755cef0e7ed0b1eef223c153f45302e0d2f Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 29 Aug 2014 10:55:18 +0200
Subject: [PATCH] configure: Make plugin related options more consistent.

That is, use the full plugin names (except "backend" prefixes) for the
--enable-* options.
---
 configure.ac    | 14 +++++++++-----
 src/Makefile.am | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37d77ff..2bcd724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,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])
@@ -473,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], [
@@ -523,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])
diff --git a/src/Makefile.am b/src/Makefile.am
index ef6367e..a69769d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -160,7 +160,7 @@ sysdbd_LDADD += -dlopen plugins/cname/dns.la
 sysdbd_DEPENDENCIES += plugins/cname/dns.la
 endif
 
-if BUILD_PLUGIN_COLLECTD
+if BUILD_PLUGIN_COLLECTDUNIXSOCK
 pkgbackendcollectdlib_LTLIBRARIES += plugins/backend/collectd/unixsock.la
 plugins_backend_collectd_unixsock_la_SOURCES = plugins/backend/collectd/unixsock.c
 plugins_backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
@@ -184,15 +184,6 @@ sysdbd_LDADD += -dlopen plugins/backend/puppet/store-configs.la
 sysdbd_DEPENDENCIES += plugins/backend/puppet/store-configs.la
 endif
 
-if BUILD_PLUGIN_RRDTOOL
-pkgtimeserieslib_LTLIBRARIES += plugins/timeseries/rrdtool.la
-plugins_timeseries_rrdtool_la_SOURCES = plugins/timeseries/rrdtool.c
-plugins_timeseries_rrdtool_la_CFLAGS = $(AM_CFLAGS) @RRD_CFLAGS@
-plugins_timeseries_rrdtool_la_LDFLAGS = $(AM_LDFLAGS) @RRD_LIBS@ -module -avoid-version
-sysdbd_LDADD += -dlopen plugins/timeseries/rrdtool.la
-sysdbd_DEPENDENCIES += plugins/timeseries/rrdtool.la
-endif
-
 if BUILD_PLUGIN_SYSLOG
 pkglib_LTLIBRARIES += plugins/syslog.la
 plugins_syslog_la_SOURCE = plugins/syslog.c
@@ -201,6 +192,15 @@ sysdbd_LDADD += -dlopen plugins/syslog.la
 sysdbd_DEPENDENCIES += plugins/syslog.la
 endif
 
+if BUILD_PLUGIN_TIMESERIESRRDTOOL
+pkgtimeserieslib_LTLIBRARIES += plugins/timeseries/rrdtool.la
+plugins_timeseries_rrdtool_la_SOURCES = plugins/timeseries/rrdtool.c
+plugins_timeseries_rrdtool_la_CFLAGS = $(AM_CFLAGS) @RRD_CFLAGS@
+plugins_timeseries_rrdtool_la_LDFLAGS = $(AM_LDFLAGS) @RRD_LIBS@ -module -avoid-version
+sysdbd_LDADD += -dlopen plugins/timeseries/rrdtool.la
+sysdbd_DEPENDENCIES += plugins/timeseries/rrdtool.la
+endif
+
 include/client/sysdb.h: include/client/sysdb.h.in ../version
 	source ../version; sed \
 	    -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
-- 
2.30.2