View | Details | Raw Unified | Return to bug 208738 | Differences between
and this patch

Collapse All | Expand All

(-)net-mgmt/collectd5.new/Makefile (-38 / +42 lines)
Lines 1-9 Link Here
1
# Created by: Matt Peterson <matt@peterson.org>
1
# Created by: Matt Peterson <matt@peterson.org>
2
# $FreeBSD: head/net-mgmt/collectd5/Makefile 412348 2016-04-01 14:17:44Z mat $
2
# $FreeBSD: head/net-mgmt/collectd5/Makefile 408548 2016-02-09 10:31:16Z madpilot $
3
3
4
PORTNAME=	collectd
4
PORTNAME=	collectd
5
PORTVERSION=	5.5.1
5
PORTVERSION=	5.5.1
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
8
MASTER_SITES=	https://collectd.org/files/ \
8
MASTER_SITES=	https://collectd.org/files/ \
9
		http://collectd.org/files/
9
		http://collectd.org/files/
Lines 16-30 Link Here
16
LICENSE_FILE=	${WRKSRC}/COPYING
16
LICENSE_FILE=	${WRKSRC}/COPYING
17
17
18
# Only autoreconf stage and sigrok plugin need GLIB:
18
# Only autoreconf stage and sigrok plugin need GLIB:
19
BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/glib-2.0.m4:devel/glib20
19
BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/glib-2.0.m4:${PORTSDIR}/devel/glib20
20
LIB_DEPENDS=	libltdl.so:devel/libltdl
20
LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
21
21
22
USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
22
USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
24
25
OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
25
OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
26
OPTIONS_GROUP=		INPUT OUTPUT
26
OPTIONS_GROUP=		INPUT OUTPUT
27
OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL
27
OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \
28
			TSDB
28
OPTIONS_GROUP_INPUT=	CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \
29
OPTIONS_GROUP_INPUT=	CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \
29
			MODBUS MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
30
			MODBUS MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
30
			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS \
31
			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS \
Lines 66-71 Link Here
66
SNMP_DESC=		Enable SNMP plugin
67
SNMP_DESC=		Enable SNMP plugin
67
STATSD_DESC=		Enable statsd plugin
68
STATSD_DESC=		Enable statsd plugin
68
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
69
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
70
TSDB_DESC=		Enable write_tsdb plugin
69
VARNISH_DESC=		Enable varnish 4.x cache statistics
71
VARNISH_DESC=		Enable varnish 4.x cache statistics
70
VIRT_DESC=		Enable libvirt plugin (requires XML)
72
VIRT_DESC=		Enable libvirt plugin (requires XML)
71
XML_DESC=		Enable XML plugins
73
XML_DESC=		Enable XML plugins
Lines 108-120 Link Here
108
		--without-oracle \
110
		--without-oracle \
109
		--disable-turbostat
111
		--disable-turbostat
110
112
111
CGI_RUN_DEPENDS=		p5-URI>=0:net/p5-URI \
113
CGI_RUN_DEPENDS=		p5-URI>=0:${PORTSDIR}/net/p5-URI \
112
				p5-CGI>=0:www/p5-CGI \
114
				p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
113
				p5-Data-Dumper>=0:devel/p5-Data-Dumper \
115
				p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
114
				p5-HTML-Parser>=0:www/p5-HTML-Parser
116
				p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
115
CGI_IMPLIES=			RRDTOOL
117
CGI_IMPLIES=			RRDTOOL
116
118
117
CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
119
CURL_LIB_DEPENDS=		libcurl.so:${PORTSDIR}/ftp/curl
118
CURL_CONFIGURE_ENABLE=		apache curl nginx write_http
120
CURL_CONFIGURE_ENABLE=		apache curl nginx write_http
119
CURL_CONFIGURE_WITH=		libcurl=${LOCALBASE}
121
CURL_CONFIGURE_WITH=		libcurl=${LOCALBASE}
120
122
Lines 126-162 Link Here
126
128
127
DEBUG_CONFIGURE_ENABLE=		debug
129
DEBUG_CONFIGURE_ENABLE=		debug
128
130
129
DBI_LIB_DEPENDS=		libdbi.so:databases/libdbi
131
DBI_LIB_DEPENDS=		libdbi.so:${PORTSDIR}/databases/libdbi
130
DBI_CONFIGURE_WITH=		libdbi=${LOCALBASE}
132
DBI_CONFIGURE_WITH=		libdbi=${LOCALBASE}
131
DBI_CONFIGURE_ENABLE=		dbi
133
DBI_CONFIGURE_ENABLE=		dbi
132
DBI_CFLAGS=			-Wno-deprecated-declarations
134
DBI_CFLAGS=			-Wno-deprecated-declarations
133
135
134
GCRYPT_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt
136
GCRYPT_LIB_DEPENDS=		libgcrypt.so:${PORTSDIR}/security/libgcrypt
135
GCRYPT_CONFIGURE_WITH=		-with-libgcrypt=${LOCALBASE}
137
GCRYPT_CONFIGURE_WITH=		-with-libgcrypt=${LOCALBASE}
136
GCRYPT_LIBS=			-lgcrypt
138
GCRYPT_LIBS=			-lgcrypt
137
139
138
IPMI_LIB_DEPENDS=		libOpenIPMI.so:sysutils/openipmi
140
IPMI_LIB_DEPENDS=		libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
139
IPMI_CONFIGURE_ENABLE=		ipmi
141
IPMI_CONFIGURE_ENABLE=		ipmi
140
142
141
JSON_LIB_DEPENDS=		libyajl.so:devel/yajl
143
JSON_LIB_DEPENDS=		libyajl.so:${PORTSDIR}/devel/yajl
142
JSON_CONFIGURE_WITH=		libyajl=${LOCALBASE}
144
JSON_CONFIGURE_WITH=		libyajl=${LOCALBASE}
143
145
144
KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
146
KAFKA_LIB_DEPENDS=		librdkafka.so:${PORTSDIR}/net/librdkafka
145
KAFKA_CONFIGURE_ENABLE=		write_kafka
147
KAFKA_CONFIGURE_ENABLE=		write_kafka
146
148
147
LOGSTASH_CONFIGURE_ENABLE=	log_logstash
149
LOGSTASH_CONFIGURE_ENABLE=	log_logstash
148
LOGSTASH_IMPLIES=		JSON
150
LOGSTASH_IMPLIES=		JSON
149
151
150
MEMCACHEC_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
152
MEMCACHEC_LIB_DEPENDS=		libmemcached.so:${PORTSDIR}/databases/libmemcached
151
MEMCACHEC_CONFIGURE_ENABLE=	memcachec
153
MEMCACHEC_CONFIGURE_ENABLE=	memcachec
152
MEMCACHEC_CONFIGURE_WITH=	libmemcached=${LOCALBASE}
154
MEMCACHEC_CONFIGURE_WITH=	libmemcached=${LOCALBASE}
153
155
154
MODBUS_LIB_DEPENDS=		libmodbus.so:comms/libmodbus
156
MODBUS_LIB_DEPENDS=		libmodbus.so:${PORTSDIR}/comms/libmodbus
155
MODBUS_CONFIGURE_ENABLE=	modbus
157
MODBUS_CONFIGURE_ENABLE=	modbus
156
MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
158
MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
157
159
158
MONGODB_LIB_DEPENDS=		libmongoc-1.0.so:devel/mongo-c-driver
160
MONGODB_LIB_DEPENDS=		libmongoc-1.0.so:${PORTSDIR}/devel/mongo-c-driver
159
MONGODB_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson
161
MONGODB_LIB_DEPENDS+=		libbson-1.0.so:${PORTSDIR}/devel/libbson
160
MONGODB_CONFIGURE_ENABLE=	write_mongodb
162
MONGODB_CONFIGURE_ENABLE=	write_mongodb
161
MONGODB_CONFIGURE_WITH=		libmongoc=${LOCALBASE}
163
MONGODB_CONFIGURE_WITH=		libmongoc=${LOCALBASE}
162
MONGODB_BROKEN=			fails to configure with write_mongodb option
164
MONGODB_BROKEN=			fails to configure with write_mongodb option
Lines 165-185 Link Here
165
MYSQL_CONFIGURE_ENABLE=		mysql
167
MYSQL_CONFIGURE_ENABLE=		mysql
166
MYSQL_CONFIGURE_WITH=		libmysql=${LOCALBASE}
168
MYSQL_CONFIGURE_WITH=		libmysql=${LOCALBASE}
167
169
168
NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
170
NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
169
NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
171
NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
170
NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
172
NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
171
173
172
NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:mail/libesmtp
174
NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
173
NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
175
NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
174
NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}
176
NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}
175
177
176
NUTUPS_LIB_DEPENDS=		libupsclient.so:sysutils/nut
178
NUTUPS_LIB_DEPENDS=		libupsclient.so:${PORTSDIR}/sysutils/nut
177
NUTUPS_CONFIGURE_ENABLE=	nut
179
NUTUPS_CONFIGURE_ENABLE=	nut
178
NUTUPS_CONFIGURE_WITH=		upsclient=${LOCALBASE}
180
NUTUPS_CONFIGURE_WITH=		upsclient=${LOCALBASE}
179
181
180
OLSRD_CONFIGURE_ENABLE=		olsrd
182
OLSRD_CONFIGURE_ENABLE=		olsrd
181
183
182
ONEWIRE_LIB_DEPENDS=		libow.so:comms/owfs
184
ONEWIRE_LIB_DEPENDS=		libow.so:${PORTSDIR}/comms/owfs
183
ONEWIRE_CONFIGURE_ENABLE=	onewire
185
ONEWIRE_CONFIGURE_ENABLE=	onewire
184
ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
186
ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
185
187
Lines 195-204 Link Here
195
PGSQL_CONFIGURE_ENABLE=		postgresql
197
PGSQL_CONFIGURE_ENABLE=		postgresql
196
PGSQL_CONFIGURE_WITH=		postgresql=${LOCALBASE} libpq
198
PGSQL_CONFIGURE_WITH=		postgresql=${LOCALBASE} libpq
197
199
198
PINBA_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
200
PINBA_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
199
PINBA_CONFIGURE_ENABLE=		pinba
201
PINBA_CONFIGURE_ENABLE=		pinba
200
202
201
PING_LIB_DEPENDS=		liboping.so:net/liboping
203
PING_LIB_DEPENDS=		liboping.so:${PORTSDIR}/net/liboping
202
PING_CONFIGURE_ENABLE=		ping
204
PING_CONFIGURE_ENABLE=		ping
203
PING_CONFIGURE_WITH=		liboping=${LOCALBASE}
205
PING_CONFIGURE_WITH=		liboping=${LOCALBASE}
204
206
Lines 206-264 Link Here
206
PYTHON_CONFIGURE_ENABLE=	python
208
PYTHON_CONFIGURE_ENABLE=	python
207
PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}
209
PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}
208
210
209
RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
211
RABBITMQ_LIB_DEPENDS=		librabbitmq.so:${PORTSDIR}/net/rabbitmq-c
210
RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
212
RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
211
RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
213
RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
212
214
213
REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
215
REDIS_LIB_DEPENDS=		libhiredis.so:${PORTSDIR}/databases/hiredis
214
REDIS_CONFIGURE_ENABLE=		redis write_redis
216
REDIS_CONFIGURE_ENABLE=		redis write_redis
215
REDIS_CONFIGURE_WITH=		libhiredis=${LOCALBASE}
217
REDIS_CONFIGURE_WITH=		libhiredis=${LOCALBASE}
216
218
217
RIEMANN_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
219
RIEMANN_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
218
RIEMANN_CONFIGURE_ENABLE=	write_riemann
220
RIEMANN_CONFIGURE_ENABLE=	write_riemann
219
221
220
ROUTEROS_LIB_DEPENDS=		librouteros.so:net/librouteros
222
ROUTEROS_LIB_DEPENDS=		librouteros.so:${PORTSDIR}/net/librouteros
221
ROUTEROS_CONFIGURE_ENABLE=	routeros
223
ROUTEROS_CONFIGURE_ENABLE=	routeros
222
ROUTEROS_CONFIGURE_WITH=	librouteros=${LOCALBASE}
224
ROUTEROS_CONFIGURE_WITH=	librouteros=${LOCALBASE}
223
225
224
RRDTOOL_LIB_DEPENDS=		librrd.so:databases/rrdtool
226
RRDTOOL_LIB_DEPENDS=		librrd.so:${PORTSDIR}/databases/rrdtool
225
RRDTOOL_CONFIGURE_ENABLE=	rrdcached rrdtool
227
RRDTOOL_CONFIGURE_ENABLE=	rrdcached rrdtool
226
RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}
228
RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}
227
229
228
SIGROK_USE=			GNOME=glib20
230
SIGROK_USE=			GNOME=glib20
229
SIGROK_CFLAGS=			`pkg-config --cflags glib-2.0`
231
SIGROK_CFLAGS=			`pkg-config --cflags glib-2.0`
230
SIGROK_LIB_DEPENDS=		libsigrok.so:devel/libsigrok
232
SIGROK_LIB_DEPENDS=		libsigrok.so:${PORTSDIR}/devel/libsigrok
231
SIGROK_CONFIGURE_ENABLE=	sigrok
233
SIGROK_CONFIGURE_ENABLE=	sigrok
232
SIGROK_CONFIGURE_WITH=		libsigrok
234
SIGROK_CONFIGURE_WITH=		libsigrok
233
235
234
SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
236
SNMP_LIB_DEPENDS=		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
235
SNMP_CONFIGURE_ENABLE=		snmp
237
SNMP_CONFIGURE_ENABLE=		snmp
236
SNMP_CONFIGURE_WITH=		libnetsnmp
238
SNMP_CONFIGURE_WITH=		libnetsnmp
237
239
238
STATSD_CONFIGURE_ENABLE=	statsd
240
STATSD_CONFIGURE_ENABLE=	statsd
239
241
240
TOKYOTYRANT_LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant
242
TOKYOTYRANT_LIB_DEPENDS=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
241
TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
243
TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
242
TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
244
TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
243
245
244
VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish4
246
TSDB_CONFIGURE_ENABLE=		write_tsdb
247
248
VARNISH_LIB_DEPENDS=		libvarnishapi.so:${PORTSDIR}/www/varnish4
245
VARNISH_CONFIGURE_ENABLE=	varnish
249
VARNISH_CONFIGURE_ENABLE=	varnish
246
VARNISH_CONFIGURE_WITH=		libvarnish=${LOCALBASE}
250
VARNISH_CONFIGURE_WITH=		libvarnish=${LOCALBASE}
247
251
248
VIRT_IMPLIES=			XML
252
VIRT_IMPLIES=			XML
249
VIRT_LIB_DEPENDS=		libvirt.so:devel/libvirt
253
VIRT_LIB_DEPENDS=		libvirt.so:${PORTSDIR}/devel/libvirt
250
VIRT_CONFIGURE_ENABLE=		virt
254
VIRT_CONFIGURE_ENABLE=		virt
251
VIRT_CONFIGURE_WITH=		virt=${LOCALBASE}
255
VIRT_CONFIGURE_WITH=		virt=${LOCALBASE}
252
256
253
XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
257
XML_LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2
254
XML_CONFIGURE_WITH=		libxml2=${LOCALBASE}
258
XML_CONFIGURE_WITH=		libxml2=${LOCALBASE}
255
259
256
XMMS_CFLAGS=			`xmms-config --cflags`
260
XMMS_CFLAGS=			`xmms-config --cflags`
257
XMMS_LIB_DEPENDS=		libxmms.so:multimedia/xmms
261
XMMS_LIB_DEPENDS=		libxmms.so:${PORTSDIR}/multimedia/xmms
258
XMMS_CONFIGURE_ENABLE=		xmms
262
XMMS_CONFIGURE_ENABLE=		xmms
259
XMMS_CONFIGURE_WITH=		libxmms=${LOCALBASE}
263
XMMS_CONFIGURE_WITH=		libxmms=${LOCALBASE}
260
264
261
ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:devel/libzookeeper
265
ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
262
ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
266
ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
263
ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}
267
ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}
264
268
(-)net-mgmt/collectd5.new/files/patch-src__Makefile.in (+1041 lines)
Line 0 Link Here
1
--- src/Makefile.in.orig	2016-01-22 09:55:46 UTC
2
+++ src/Makefile.in
3
@@ -1,7 +1,7 @@
4
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
5
+# Makefile.in generated by automake 1.15 from Makefile.am.
6
 # @configure_input@
7
 
8
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
9
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
10
 
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
@@ -16,7 +16,17 @@
14
 
15
 
16
 VPATH = @srcdir@
17
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18
+am__is_gnu_make = { \
19
+  if test -z '$(MAKELEVEL)'; then \
20
+    false; \
21
+  elif test -n '$(MAKE_HOST)'; then \
22
+    true; \
23
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24
+    true; \
25
+  else \
26
+    false; \
27
+  fi; \
28
+}
29
 am__make_running_with_option = \
30
   case $${target_option-} in \
31
       ?) ;; \
32
@@ -112,7 +122,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
33
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@am__append_28 = contextswitch.la
34
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_29 = -lperfstat
35
 @BUILD_PLUGIN_CPU_TRUE@am__append_30 = cpu.la
36
-@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_31 = -lkstat
37
+@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_31 = $(BUILD_WITH_LIBKSTAT_LIBS)
38
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_32 = -ldevinfo
39
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_33 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
40
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_34 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
41
@@ -129,191 +139,196 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
42
 @BUILD_PLUGIN_DBI_TRUE@am__append_45 = dbi.la
43
 @BUILD_PLUGIN_DF_TRUE@am__append_46 = df.la
44
 @BUILD_PLUGIN_DISK_TRUE@am__append_47 = disk.la
45
-@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_48 = -lkstat
46
+@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_48 = $(BUILD_WITH_LIBKSTAT_LIBS)
47
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_49 = -ldevinfo
48
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBIOKIT_TRUE@am__append_50 = -framework IOKit
49
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_51 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
50
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_52 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
51
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_53 = -ludev
52
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_54 = -lperfstat
53
-@BUILD_PLUGIN_DNS_TRUE@am__append_55 = dns.la
54
-@BUILD_PLUGIN_DRBD_TRUE@am__append_56 = drbd.la
55
-@BUILD_PLUGIN_EMAIL_TRUE@am__append_57 = email.la
56
-@BUILD_PLUGIN_ENTROPY_TRUE@am__append_58 = entropy.la
57
-@BUILD_PLUGIN_EXEC_TRUE@am__append_59 = exec.la
58
-@BUILD_PLUGIN_ETHSTAT_TRUE@am__append_60 = ethstat.la
59
-@BUILD_PLUGIN_FHCOUNT_TRUE@am__append_61 = fhcount.la
60
-@BUILD_PLUGIN_FILECOUNT_TRUE@am__append_62 = filecount.la
61
-@BUILD_PLUGIN_GMOND_TRUE@am__append_63 = gmond.la
62
-@BUILD_PLUGIN_HDDTEMP_TRUE@am__append_64 = hddtemp.la
63
-@BUILD_PLUGIN_HDDTEMP_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_65 = -lsocket
64
-@BUILD_PLUGIN_INTERFACE_TRUE@am__append_66 = interface.la
65
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_67 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
66
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_68 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
67
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_69 = -lkstat
68
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_70 = -ldevinfo
69
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_71 = -lperfstat
70
-@BUILD_PLUGIN_IPC_TRUE@am__append_72 = ipc.la
71
-@BUILD_PLUGIN_IPTABLES_TRUE@am__append_73 = iptables.la
72
-@BUILD_PLUGIN_IPMI_TRUE@am__append_74 = ipmi.la
73
-@BUILD_PLUGIN_IPVS_TRUE@am__append_75 = ipvs.la
74
-@BUILD_PLUGIN_IRQ_TRUE@am__append_76 = irq.la
75
-@BUILD_PLUGIN_JAVA_TRUE@am__append_77 = java.la
76
-@BUILD_PLUGIN_LOAD_TRUE@am__append_78 = load.la
77
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_79 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
78
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_80 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
79
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_81 = -lperfstat
80
-@BUILD_PLUGIN_LOGFILE_TRUE@am__append_82 = logfile.la
81
-@BUILD_PLUGIN_LOG_LOGSTASH_TRUE@am__append_83 = log_logstash.la
82
-@BUILD_PLUGIN_LPAR_TRUE@am__append_84 = lpar.la
83
-@BUILD_PLUGIN_LVM_TRUE@am__append_85 = lvm.la
84
-@BUILD_PLUGIN_MADWIFI_TRUE@am__append_86 = madwifi.la
85
-@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@am__append_87 = match_empty_counter.la
86
-@BUILD_PLUGIN_MATCH_HASHED_TRUE@am__append_88 = match_hashed.la
87
-@BUILD_PLUGIN_MATCH_REGEX_TRUE@am__append_89 = match_regex.la
88
-@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@am__append_90 = match_timediff.la
89
-@BUILD_PLUGIN_MATCH_VALUE_TRUE@am__append_91 = match_value.la
90
-@BUILD_PLUGIN_MBMON_TRUE@am__append_92 = mbmon.la
91
-@BUILD_PLUGIN_MBMON_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_93 = -lsocket
92
-@BUILD_PLUGIN_MD_TRUE@am__append_94 = md.la
93
-@BUILD_PLUGIN_MEMCACHEC_TRUE@am__append_95 = memcachec.la
94
-@BUILD_PLUGIN_MEMCACHED_TRUE@am__append_96 = memcached.la
95
-@BUILD_PLUGIN_MEMCACHED_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_97 = -lsocket
96
-@BUILD_PLUGIN_MEMORY_TRUE@am__append_98 = memory.la
97
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_99 = -lkstat
98
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_100 = -ldevinfo
99
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_101 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
100
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_102 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
101
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_103 = -lperfstat
102
-@BUILD_PLUGIN_MIC_TRUE@am__append_104 = mic.la
103
-@BUILD_PLUGIN_MODBUS_TRUE@am__append_105 = modbus.la
104
-@BUILD_PLUGIN_MULTIMETER_TRUE@am__append_106 = multimeter.la
105
-@BUILD_PLUGIN_MYSQL_TRUE@am__append_107 = mysql.la
106
-@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_108 = $(BUILD_WITH_LIBMYSQL_CFLAGS)
107
-@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_LIBS)
108
-@BUILD_PLUGIN_NETAPP_TRUE@am__append_110 = netapp.la
109
-@BUILD_PLUGIN_NETLINK_TRUE@am__append_111 = netlink.la
110
-@BUILD_PLUGIN_NETWORK_TRUE@am__append_112 = network.la
111
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_113 = -lsocket
112
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_114 = $(GCRYPT_CPPFLAGS)
113
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_LDFLAGS)
114
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LIBS)
115
-@BUILD_PLUGIN_NFS_TRUE@am__append_117 = nfs.la
116
-@BUILD_PLUGIN_FSCACHE_TRUE@am__append_118 = fscache.la
117
-@BUILD_PLUGIN_NGINX_TRUE@am__append_119 = nginx.la
118
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_120 = $(BUILD_WITH_LIBCURL_CFLAGS)
119
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_LIBS)
120
-@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_122 = notify_desktop.la
121
-@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_123 = notify_email.la
122
-@BUILD_PLUGIN_NTPD_TRUE@am__append_124 = ntpd.la
123
-@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_125 = -lsocket
124
-@BUILD_PLUGIN_NUMA_TRUE@am__append_126 = numa.la
125
-@BUILD_PLUGIN_NUT_TRUE@am__append_127 = nut.la
126
-@BUILD_PLUGIN_OLSRD_TRUE@am__append_128 = olsrd.la
127
-@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_129 = -lsocket
128
-@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_130 = onewire.la
129
-@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_131 = openldap.la
130
-@BUILD_PLUGIN_OPENVPN_TRUE@am__append_132 = openvpn.la
131
-@BUILD_PLUGIN_ORACLE_TRUE@am__append_133 = oracle.la
132
-@BUILD_PLUGIN_PERL_TRUE@am__append_134 = perl.la
133
+@BUILD_FREEBSD_TRUE@@BUILD_PLUGIN_DISK_TRUE@am__append_55 = -ldevstat -lgeom
134
+@BUILD_PLUGIN_DNS_TRUE@am__append_56 = dns.la
135
+@BUILD_PLUGIN_DRBD_TRUE@am__append_57 = drbd.la
136
+@BUILD_PLUGIN_EMAIL_TRUE@am__append_58 = email.la
137
+@BUILD_PLUGIN_ENTROPY_TRUE@am__append_59 = entropy.la
138
+@BUILD_PLUGIN_EXEC_TRUE@am__append_60 = exec.la
139
+@BUILD_PLUGIN_ETHSTAT_TRUE@am__append_61 = ethstat.la
140
+@BUILD_PLUGIN_FHCOUNT_TRUE@am__append_62 = fhcount.la
141
+@BUILD_PLUGIN_FILECOUNT_TRUE@am__append_63 = filecount.la
142
+@BUILD_PLUGIN_GMOND_TRUE@am__append_64 = gmond.la
143
+@BUILD_PLUGIN_HDDTEMP_TRUE@am__append_65 = hddtemp.la
144
+@BUILD_PLUGIN_HDDTEMP_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_66 = -lsocket
145
+@BUILD_PLUGIN_INTERFACE_TRUE@am__append_67 = interface.la
146
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_68 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
147
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_69 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
148
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_70 = $(BUILD_WITH_LIBKSTAT_LIBS)
149
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_71 = -ldevinfo
150
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_72 = -lperfstat
151
+@BUILD_PLUGIN_IPC_TRUE@am__append_73 = ipc.la
152
+@BUILD_PLUGIN_IPTABLES_TRUE@am__append_74 = iptables.la
153
+@BUILD_PLUGIN_IPMI_TRUE@am__append_75 = ipmi.la
154
+@BUILD_PLUGIN_IPVS_TRUE@am__append_76 = ipvs.la
155
+@BUILD_PLUGIN_IRQ_TRUE@am__append_77 = irq.la
156
+@BUILD_PLUGIN_JAVA_TRUE@am__append_78 = java.la
157
+@BUILD_PLUGIN_LOAD_TRUE@am__append_79 = load.la
158
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_80 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
159
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_81 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
160
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_82 = -lperfstat
161
+@BUILD_PLUGIN_LOGFILE_TRUE@am__append_83 = logfile.la
162
+@BUILD_PLUGIN_LOG_LOGSTASH_TRUE@am__append_84 = log_logstash.la
163
+@BUILD_PLUGIN_LPAR_TRUE@am__append_85 = lpar.la
164
+@BUILD_PLUGIN_LVM_TRUE@am__append_86 = lvm.la
165
+@BUILD_PLUGIN_MADWIFI_TRUE@am__append_87 = madwifi.la
166
+@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@am__append_88 = match_empty_counter.la
167
+@BUILD_PLUGIN_MATCH_HASHED_TRUE@am__append_89 = match_hashed.la
168
+@BUILD_PLUGIN_MATCH_REGEX_TRUE@am__append_90 = match_regex.la
169
+@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@am__append_91 = match_timediff.la
170
+@BUILD_PLUGIN_MATCH_VALUE_TRUE@am__append_92 = match_value.la
171
+@BUILD_PLUGIN_MBMON_TRUE@am__append_93 = mbmon.la
172
+@BUILD_PLUGIN_MBMON_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_94 = -lsocket
173
+@BUILD_PLUGIN_MD_TRUE@am__append_95 = md.la
174
+@BUILD_PLUGIN_MEMCACHEC_TRUE@am__append_96 = memcachec.la
175
+@BUILD_PLUGIN_MEMCACHED_TRUE@am__append_97 = memcached.la
176
+@BUILD_PLUGIN_MEMCACHED_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_98 = -lsocket
177
+@BUILD_PLUGIN_MEMORY_TRUE@am__append_99 = memory.la
178
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_100 = $(BUILD_WITH_LIBKSTAT_LIBS)
179
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_101 = -ldevinfo
180
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_102 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
181
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_103 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
182
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_104 = -lperfstat
183
+@BUILD_PLUGIN_MIC_TRUE@am__append_105 = mic.la
184
+@BUILD_PLUGIN_MODBUS_TRUE@am__append_106 = modbus.la
185
+@BUILD_PLUGIN_MULTIMETER_TRUE@am__append_107 = multimeter.la
186
+@BUILD_PLUGIN_MYSQL_TRUE@am__append_108 = mysql.la
187
+@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_CFLAGS)
188
+@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_110 = $(BUILD_WITH_LIBMYSQL_LIBS)
189
+@BUILD_PLUGIN_NETAPP_TRUE@am__append_111 = netapp.la
190
+@BUILD_PLUGIN_NETLINK_TRUE@am__append_112 = netlink.la
191
+@BUILD_PLUGIN_NETWORK_TRUE@am__append_113 = network.la
192
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_114 = -lsocket
193
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_CPPFLAGS)
194
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LDFLAGS)
195
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_117 = $(GCRYPT_LIBS)
196
+@BUILD_PLUGIN_NFS_TRUE@am__append_118 = nfs.la
197
+@BUILD_PLUGIN_FSCACHE_TRUE@am__append_119 = fscache.la
198
+@BUILD_PLUGIN_NGINX_TRUE@am__append_120 = nginx.la
199
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_CFLAGS)
200
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_122 = $(BUILD_WITH_LIBCURL_LIBS)
201
+@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_123 = notify_desktop.la
202
+@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_124 = notify_email.la
203
+@BUILD_PLUGIN_NTPD_TRUE@am__append_125 = ntpd.la
204
+@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_126 = -lsocket
205
+@BUILD_PLUGIN_NUMA_TRUE@am__append_127 = numa.la
206
+@BUILD_PLUGIN_NUT_TRUE@am__append_128 = nut.la
207
+@BUILD_PLUGIN_OLSRD_TRUE@am__append_129 = olsrd.la
208
+@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_130 = -lsocket
209
+@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_131 = onewire.la
210
+@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_132 = openldap.la
211
+@BUILD_PLUGIN_OPENVPN_TRUE@am__append_133 = openvpn.la
212
+@BUILD_PLUGIN_ORACLE_TRUE@am__append_134 = oracle.la
213
+@BUILD_PLUGIN_PERL_TRUE@am__append_135 = perl.la
214
 # Work-around for issues #41 and #42 - Perl 5.10 incorrectly introduced
215
 # __attribute__nonnull__(3) for Perl_load_module().
216
-@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_135 = -Wno-nonnull
217
-@BUILD_PLUGIN_PF_TRUE@am__append_136 = pf.la
218
-@BUILD_PLUGIN_PINBA_TRUE@am__append_137 = pinba.la
219
-@BUILD_PLUGIN_PING_TRUE@am__append_138 = ping.la
220
-@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_139 = postgresql.la
221
-@BUILD_PLUGIN_POWERDNS_TRUE@am__append_140 = powerdns.la
222
-@BUILD_PLUGIN_PYTHON_TRUE@am__append_141 = python.la
223
-@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_142 = -fno-strict-aliasing -Wno-strict-aliasing
224
-@BUILD_PLUGIN_PROCESSES_TRUE@am__append_143 = processes.la
225
-@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_144 = -lkvm
226
-@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_145 = protocols.la
227
-@BUILD_PLUGIN_REDIS_TRUE@am__append_146 = redis.la
228
-@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_147 = routeros.la
229
-@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_148 = rrdcached.la
230
-@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_149 = rrdtool.la
231
-@BUILD_PLUGIN_SENSORS_TRUE@am__append_150 = sensors.la
232
-@BUILD_PLUGIN_SERIAL_TRUE@am__append_151 = serial.la
233
-@BUILD_PLUGIN_SIGROK_TRUE@am__append_152 = sigrok.la
234
-@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_153 = smart.la
235
-@BUILD_PLUGIN_SNMP_TRUE@am__append_154 = snmp.la
236
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_155 = $(BUILD_WITH_LIBSNMP_CFLAGS)
237
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_LIBS)
238
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_157 = -lpthread
239
-@BUILD_PLUGIN_STATSD_TRUE@am__append_158 = statsd.la
240
-@BUILD_PLUGIN_SWAP_TRUE@am__append_159 = swap.la
241
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_160 = -lkstat
242
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_161 = -ldevinfo
243
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_162 = -lkvm
244
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_163 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
245
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
246
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_165 = -lperfstat
247
-@BUILD_PLUGIN_SYSLOG_TRUE@am__append_166 = syslog.la
248
-@BUILD_PLUGIN_TABLE_TRUE@am__append_167 = table.la
249
-@BUILD_PLUGIN_TAIL_TRUE@am__append_168 = tail.la
250
-@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_169 = tail_csv.la
251
-@BUILD_PLUGIN_TAPE_TRUE@am__append_170 = tape.la
252
-@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_171 = target_notification.la
253
-@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_172 = target_replace.la
254
-@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_173 = target_scale.la
255
-@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_174 = target_set.la
256
-@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_175 = target_v5upgrade.la
257
-@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_176 = tcpconns.la
258
-@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_177 = -lkvm
259
-@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_178 = teamspeak2.la
260
-@BUILD_PLUGIN_TED_TRUE@am__append_179 = ted.la
261
-@BUILD_PLUGIN_THERMAL_TRUE@am__append_180 = thermal.la
262
-@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_181 = threshold.la
263
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_182 = tokyotyrant.la
264
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_183 = -lsocket
265
-@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_184 = turbostat.la
266
-@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_185 = unixsock.la
267
-@BUILD_PLUGIN_UPTIME_TRUE@am__append_186 = uptime.la
268
-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_187 = -lkstat
269
-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_188 = -lperfstat
270
-@BUILD_PLUGIN_USERS_TRUE@am__append_189 = users.la
271
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_190 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
272
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
273
-@BUILD_PLUGIN_UUID_TRUE@am__append_192 = uuid.la
274
-@BUILD_PLUGIN_VARNISH_TRUE@am__append_193 = varnish.la
275
-@BUILD_PLUGIN_VIRT_TRUE@am__append_194 = virt.la
276
-@BUILD_PLUGIN_VMEM_TRUE@am__append_195 = vmem.la
277
-@BUILD_PLUGIN_VSERVER_TRUE@am__append_196 = vserver.la
278
-@BUILD_PLUGIN_WIRELESS_TRUE@am__append_197 = wireless.la
279
-@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_198 = write_graphite.la
280
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_199 = write_http.la
281
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_200 = $(BUILD_WITH_LIBCURL_CFLAGS)
282
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_LIBS)
283
-@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_202 = write_kafka.la
284
-@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_203 = write_log.la
285
-@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_204 = write_mongodb.la
286
-@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_205 = write_redis.la
287
-@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_206 = write_riemann.la
288
-@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_207 = write_sensu.la
289
-@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_208 = write_tsdb.la
290
-@BUILD_PLUGIN_XMMS_TRUE@am__append_209 = xmms.la
291
-@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_210 = zfs_arc.la
292
-@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_211 = zookeeper.la
293
-@BUILD_PLUGIN_PINBA_TRUE@am__append_212 = pinba.pb-c.c pinba.pb-c.h
294
+@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_136 = -Wno-nonnull
295
+@BUILD_PLUGIN_PF_TRUE@am__append_137 = pf.la
296
+@BUILD_PLUGIN_PINBA_TRUE@am__append_138 = pinba.la
297
+@BUILD_PLUGIN_PING_TRUE@am__append_139 = ping.la
298
+@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_140 = postgresql.la
299
+@BUILD_PLUGIN_POWERDNS_TRUE@am__append_141 = powerdns.la
300
+@BUILD_PLUGIN_PYTHON_TRUE@am__append_142 = python.la
301
+@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_143 = -fno-strict-aliasing -Wno-strict-aliasing
302
+@BUILD_PLUGIN_PROCESSES_TRUE@am__append_144 = processes.la
303
+@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_145 = -lkvm
304
+@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_146 = protocols.la
305
+@BUILD_PLUGIN_REDIS_TRUE@am__append_147 = redis.la
306
+@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_148 = routeros.la
307
+@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_149 = rrdcached.la
308
+@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_150 = rrdtool.la
309
+@BUILD_PLUGIN_SENSORS_TRUE@am__append_151 = sensors.la
310
+@BUILD_PLUGIN_SERIAL_TRUE@am__append_152 = serial.la
311
+@BUILD_PLUGIN_SIGROK_TRUE@am__append_153 = sigrok.la
312
+@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_154 = smart.la
313
+@BUILD_PLUGIN_SNMP_TRUE@am__append_155 = snmp.la
314
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_CFLAGS)
315
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_157 = $(BUILD_WITH_LIBSNMP_LIBS)
316
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_158 = -lpthread
317
+@BUILD_PLUGIN_STATSD_TRUE@am__append_159 = statsd.la
318
+@BUILD_PLUGIN_SWAP_TRUE@am__append_160 = swap.la
319
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_161 = $(BUILD_WITH_LIBKSTAT_LIBS)
320
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_162 = -ldevinfo
321
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_163 = -lkvm
322
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
323
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_165 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
324
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_166 = -lperfstat
325
+@BUILD_PLUGIN_SYSLOG_TRUE@am__append_167 = syslog.la
326
+@BUILD_PLUGIN_TABLE_TRUE@am__append_168 = table.la
327
+@BUILD_PLUGIN_TAIL_TRUE@am__append_169 = tail.la
328
+@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_170 = tail_csv.la
329
+@BUILD_PLUGIN_TAPE_TRUE@am__append_171 = tape.la
330
+@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_172 = target_notification.la
331
+@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_173 = target_replace.la
332
+@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_174 = target_scale.la
333
+@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_175 = target_set.la
334
+@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_176 = target_v5upgrade.la
335
+@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_177 = tcpconns.la
336
+@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_178 = -lkvm
337
+@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_179 = teamspeak2.la
338
+@BUILD_PLUGIN_TED_TRUE@am__append_180 = ted.la
339
+@BUILD_PLUGIN_THERMAL_TRUE@am__append_181 = thermal.la
340
+@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_182 = threshold.la
341
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_183 = tokyotyrant.la
342
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_184 = -lsocket
343
+@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_185 = turbostat.la
344
+@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_186 = unixsock.la
345
+@BUILD_PLUGIN_UPTIME_TRUE@am__append_187 = uptime.la
346
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_188 = $(BUILD_WITH_LIBKSTAT_LIBS)
347
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_189 = -lperfstat
348
+@BUILD_PLUGIN_USERS_TRUE@am__append_190 = users.la
349
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
350
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_192 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
351
+@BUILD_PLUGIN_UUID_TRUE@am__append_193 = uuid.la
352
+@BUILD_PLUGIN_VARNISH_TRUE@am__append_194 = varnish.la
353
+@BUILD_PLUGIN_VIRT_TRUE@am__append_195 = virt.la
354
+@BUILD_PLUGIN_VMEM_TRUE@am__append_196 = vmem.la
355
+@BUILD_PLUGIN_VSERVER_TRUE@am__append_197 = vserver.la
356
+@BUILD_PLUGIN_WIRELESS_TRUE@am__append_198 = wireless.la
357
+@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_199 = write_graphite.la
358
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_200 = write_http.la
359
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_CFLAGS)
360
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_202 = $(BUILD_WITH_LIBCURL_LIBS)
361
+@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_203 = write_kafka.la
362
+@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_204 = write_log.la
363
+@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_205 = write_mongodb.la
364
+@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_206 = write_redis.la
365
+@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_207 = write_riemann.la
366
+@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_208 = write_sensu.la
367
+@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_209 = write_tsdb.la
368
+@BUILD_PLUGIN_XMMS_TRUE@am__append_210 = xmms.la
369
+@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_211 = zfs_arc.la
370
+@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_212 = zookeeper.la
371
 @BUILD_PLUGIN_PINBA_TRUE@am__append_213 = pinba.pb-c.c pinba.pb-c.h
372
-@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_214 = riemann.pb-c.c riemann.pb-c.h
373
+@BUILD_PLUGIN_PINBA_TRUE@am__append_214 = pinba.pb-c.c pinba.pb-c.h
374
 @BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_215 = riemann.pb-c.c riemann.pb-c.h
375
+@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_216 = riemann.pb-c.c riemann.pb-c.h
376
 check_PROGRAMS = test_utils_mount$(EXEEXT) \
377
 	test_utils_vl_lookup$(EXEEXT) $(am__EXEEXT_1)
378
 TESTS = test_utils_mount$(EXEEXT) test_utils_vl_lookup$(EXEEXT) \
379
 	$(am__EXEEXT_1)
380
-@BUILD_PLUGIN_CEPH_TRUE@am__append_216 = test_plugin_ceph
381
 @BUILD_PLUGIN_CEPH_TRUE@am__append_217 = test_plugin_ceph
382
+@BUILD_PLUGIN_CEPH_TRUE@am__append_218 = test_plugin_ceph
383
 subdir = src
384
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
385
-	$(srcdir)/config.h.in $(srcdir)/collectd.conf.in \
386
-	$(top_srcdir)/libltdl/config/depcomp $(dist_man_MANS) \
387
-	$(top_srcdir)/libltdl/config/test-driver
388
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
389
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
390
+am__aclocal_m4_deps = $(top_srcdir)/libltdl/m4/libtool.m4 \
391
+	$(top_srcdir)/libltdl/m4/ltargz.m4 \
392
+	$(top_srcdir)/libltdl/m4/ltdl.m4 \
393
+	$(top_srcdir)/libltdl/m4/ltoptions.m4 \
394
+	$(top_srcdir)/libltdl/m4/ltsugar.m4 \
395
+	$(top_srcdir)/libltdl/m4/ltversion.m4 \
396
+	$(top_srcdir)/libltdl/m4/lt~obsolete.m4 \
397
+	$(top_srcdir)/configure.ac
398
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
399
 	$(ACLOCAL_M4)
400
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
401
 mkinstalldirs = $(install_sh) -d
402
 CONFIG_HEADER = config.h
403
 CONFIG_CLEAN_FILES = collectd.conf
404
@@ -495,10 +510,11 @@ contextswitch_la_LINK = $(LIBTOOL) $(AM_
405
 	-o $@
406
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@am_contextswitch_la_rpath = -rpath \
407
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@	$(pkglibdir)
408
-@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
409
-@BUILD_PLUGIN_CPU_TRUE@cpu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
410
+@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
411
+@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
412
+@BUILD_PLUGIN_CPU_TRUE@cpu_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
413
 @BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_1) \
414
-@BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_3) \
415
+@BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_4) \
416
 @BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_1)
417
 am__cpu_la_SOURCES_DIST = cpu.c
418
 @BUILD_PLUGIN_CPU_TRUE@am_cpu_la_OBJECTS = cpu_la-cpu.lo
419
@@ -523,8 +539,8 @@ csv_la_LINK = $(LIBTOOL) $(AM_V_lt) --ta
420
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
421
 	$(csv_la_LDFLAGS) $(LDFLAGS) -o $@
422
 @BUILD_PLUGIN_CSV_TRUE@am_csv_la_rpath = -rpath $(pkglibdir)
423
-@BUILD_PLUGIN_CURL_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
424
-@BUILD_PLUGIN_CURL_TRUE@curl_la_DEPENDENCIES = $(am__DEPENDENCIES_4)
425
+@BUILD_PLUGIN_CURL_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
426
+@BUILD_PLUGIN_CURL_TRUE@curl_la_DEPENDENCIES = $(am__DEPENDENCIES_5)
427
 am__curl_la_SOURCES_DIST = curl.c
428
 @BUILD_PLUGIN_CURL_TRUE@am_curl_la_OBJECTS = curl_la-curl.lo
429
 curl_la_OBJECTS = $(am_curl_la_OBJECTS)
430
@@ -532,10 +548,10 @@ curl_la_LINK = $(LIBTOOL) $(AM_V_lt) --t
431
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(curl_la_CFLAGS) \
432
 	$(CFLAGS) $(curl_la_LDFLAGS) $(LDFLAGS) -o $@
433
 @BUILD_PLUGIN_CURL_TRUE@am_curl_la_rpath = -rpath $(pkglibdir)
434
-@BUILD_PLUGIN_CURL_JSON_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
435
+@BUILD_PLUGIN_CURL_JSON_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
436
 @BUILD_PLUGIN_CURL_JSON_TRUE@curl_json_la_DEPENDENCIES =  \
437
 @BUILD_PLUGIN_CURL_JSON_TRUE@	$(am__DEPENDENCIES_1) \
438
-@BUILD_PLUGIN_CURL_JSON_TRUE@	$(am__DEPENDENCIES_5)
439
+@BUILD_PLUGIN_CURL_JSON_TRUE@	$(am__DEPENDENCIES_6)
440
 am__curl_json_la_SOURCES_DIST = curl_json.c
441
 @BUILD_PLUGIN_CURL_JSON_TRUE@am_curl_json_la_OBJECTS =  \
442
 @BUILD_PLUGIN_CURL_JSON_TRUE@	curl_json_la-curl_json.lo
443
@@ -573,10 +589,12 @@ df_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag
444
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
445
 	$(df_la_LDFLAGS) $(LDFLAGS) -o $@
446
 @BUILD_PLUGIN_DF_TRUE@am_df_la_rpath = -rpath $(pkglibdir)
447
-@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
448
-@BUILD_PLUGIN_DISK_TRUE@disk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
449
+@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
450
+@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
451
+@BUILD_PLUGIN_DISK_TRUE@disk_la_DEPENDENCIES = $(am__DEPENDENCIES_7) \
452
+@BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1) \
453
+@BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_8) \
454
 @BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1) \
455
-@BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_6) \
456
 @BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1) \
457
 @BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1)
458
 am__disk_la_SOURCES_DIST = disk.c
459
@@ -682,10 +700,11 @@ hddtemp_la_LINK = $(LIBTOOL) $(AM_V_lt) 
460
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
461
 	$(hddtemp_la_LDFLAGS) $(LDFLAGS) -o $@
462
 @BUILD_PLUGIN_HDDTEMP_TRUE@am_hddtemp_la_rpath = -rpath $(pkglibdir)
463
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
464
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
465
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
466
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_DEPENDENCIES =  \
467
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_7) \
468
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_1) \
469
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_9) \
470
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_10) \
471
 @BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_1) \
472
 @BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_1)
473
 am__interface_la_SOURCES_DIST = interface.c
474
@@ -753,8 +772,8 @@ liblookup_la_OBJECTS = $(am_liblookup_la
475
 libmount_la_DEPENDENCIES = daemon/libcommon.la
476
 am_libmount_la_OBJECTS = utils_mount.lo
477
 libmount_la_OBJECTS = $(am_libmount_la_OBJECTS)
478
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
479
-@BUILD_PLUGIN_LOAD_TRUE@load_la_DEPENDENCIES = $(am__DEPENDENCIES_8) \
480
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
481
+@BUILD_PLUGIN_LOAD_TRUE@load_la_DEPENDENCIES = $(am__DEPENDENCIES_11) \
482
 @BUILD_PLUGIN_LOAD_TRUE@	$(am__DEPENDENCIES_1)
483
 am__load_la_SOURCES_DIST = load.c
484
 @BUILD_PLUGIN_LOAD_TRUE@am_load_la_OBJECTS = load_la-load.lo
485
@@ -899,11 +918,12 @@ memcached_la_LINK = $(LIBTOOL) $(AM_V_lt
486
 	$(memcached_la_LDFLAGS) $(LDFLAGS) -o $@
487
 @BUILD_PLUGIN_MEMCACHED_TRUE@am_memcached_la_rpath = -rpath \
488
 @BUILD_PLUGIN_MEMCACHED_TRUE@	$(pkglibdir)
489
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
490
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
491
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
492
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_DEPENDENCIES =  \
493
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_12) \
494
 @BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_1) \
495
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_1) \
496
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_9) \
497
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_13) \
498
 @BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_1)
499
 am__memory_la_SOURCES_DIST = memory.c
500
 @BUILD_PLUGIN_MEMORY_TRUE@am_memory_la_OBJECTS = memory_la-memory.lo
501
@@ -939,9 +959,9 @@ multimeter_la_LINK = $(LIBTOOL) $(AM_V_l
502
 	$(multimeter_la_LDFLAGS) $(LDFLAGS) -o $@
503
 @BUILD_PLUGIN_MULTIMETER_TRUE@am_multimeter_la_rpath = -rpath \
504
 @BUILD_PLUGIN_MULTIMETER_TRUE@	$(pkglibdir)
505
-@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
506
+@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
507
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_DEPENDENCIES =  \
508
-@BUILD_PLUGIN_MYSQL_TRUE@	$(am__DEPENDENCIES_10)
509
+@BUILD_PLUGIN_MYSQL_TRUE@	$(am__DEPENDENCIES_14)
510
 am__mysql_la_SOURCES_DIST = mysql.c
511
 @BUILD_PLUGIN_MYSQL_TRUE@am_mysql_la_OBJECTS = mysql_la-mysql.lo
512
 mysql_la_OBJECTS = $(am_mysql_la_OBJECTS)
513
@@ -968,10 +988,10 @@ netlink_la_LINK = $(LIBTOOL) $(AM_V_lt) 
514
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(netlink_la_CFLAGS) \
515
 	$(CFLAGS) $(netlink_la_LDFLAGS) $(LDFLAGS) -o $@
516
 @BUILD_PLUGIN_NETLINK_TRUE@am_netlink_la_rpath = -rpath $(pkglibdir)
517
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
518
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
519
 @BUILD_PLUGIN_NETWORK_TRUE@network_la_DEPENDENCIES =  \
520
 @BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_1) \
521
-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_11)
522
+@BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_15)
523
 am__network_la_SOURCES_DIST = network.c network.h utils_fbhash.c \
524
 	utils_fbhash.h
525
 @BUILD_PLUGIN_NETWORK_TRUE@am_network_la_OBJECTS =  \
526
@@ -990,9 +1010,9 @@ nfs_la_LINK = $(LIBTOOL) $(AM_V_lt) --ta
527
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
528
 	$(nfs_la_LDFLAGS) $(LDFLAGS) -o $@
529
 @BUILD_PLUGIN_NFS_TRUE@am_nfs_la_rpath = -rpath $(pkglibdir)
530
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
531
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
532
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_DEPENDENCIES =  \
533
-@BUILD_PLUGIN_NGINX_TRUE@	$(am__DEPENDENCIES_12)
534
+@BUILD_PLUGIN_NGINX_TRUE@	$(am__DEPENDENCIES_16)
535
 am__nginx_la_SOURCES_DIST = nginx.c
536
 @BUILD_PLUGIN_NGINX_TRUE@am_nginx_la_OBJECTS = nginx_la-nginx.lo
537
 nginx_la_OBJECTS = $(am_nginx_la_OBJECTS)
538
@@ -1254,8 +1274,8 @@ smart_la_LINK = $(LIBTOOL) $(AM_V_lt) --
539
 @BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am_smart_la_rpath =  \
540
 @BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@	-rpath \
541
 @BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@	$(pkglibdir)
542
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
543
-@BUILD_PLUGIN_SNMP_TRUE@snmp_la_DEPENDENCIES = $(am__DEPENDENCIES_13) \
544
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
545
+@BUILD_PLUGIN_SNMP_TRUE@snmp_la_DEPENDENCIES = $(am__DEPENDENCIES_17) \
546
 @BUILD_PLUGIN_SNMP_TRUE@	$(am__DEPENDENCIES_1)
547
 am__snmp_la_SOURCES_DIST = snmp.c
548
 @BUILD_PLUGIN_SNMP_TRUE@am_snmp_la_OBJECTS = snmp_la-snmp.lo
549
@@ -1273,11 +1293,12 @@ statsd_la_LINK = $(LIBTOOL) $(AM_V_lt) -
550
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
551
 	$(statsd_la_LDFLAGS) $(LDFLAGS) -o $@
552
 @BUILD_PLUGIN_STATSD_TRUE@am_statsd_la_rpath = -rpath $(pkglibdir)
553
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
554
-@BUILD_PLUGIN_SWAP_TRUE@swap_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
555
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
556
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
557
+@BUILD_PLUGIN_SWAP_TRUE@swap_la_DEPENDENCIES = $(am__DEPENDENCIES_18) \
558
 @BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_1) \
559
 @BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_1) \
560
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_14) \
561
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_19) \
562
 @BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_1)
563
 am__swap_la_SOURCES_DIST = swap.c
564
 @BUILD_PLUGIN_SWAP_TRUE@am_swap_la_OBJECTS = swap_la-swap.lo
565
@@ -1318,7 +1339,7 @@ tail_csv_la_LINK = $(LIBTOOL) $(AM_V_lt)
566
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
567
 	$(tail_csv_la_LDFLAGS) $(LDFLAGS) -o $@
568
 @BUILD_PLUGIN_TAIL_CSV_TRUE@am_tail_csv_la_rpath = -rpath $(pkglibdir)
569
-tape_la_DEPENDENCIES =
570
+@BUILD_PLUGIN_TAPE_TRUE@tape_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
571
 am__tape_la_SOURCES_DIST = tape.c
572
 @BUILD_PLUGIN_TAPE_TRUE@am_tape_la_OBJECTS = tape.lo
573
 tape_la_OBJECTS = $(am_tape_la_OBJECTS)
574
@@ -1466,8 +1487,9 @@ unixsock_la_LINK = $(LIBTOOL) $(AM_V_lt)
575
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
576
 	$(unixsock_la_LDFLAGS) $(LDFLAGS) -o $@
577
 @BUILD_PLUGIN_UNIXSOCK_TRUE@am_unixsock_la_rpath = -rpath $(pkglibdir)
578
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_20 = $(am__DEPENDENCIES_1)
579
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_DEPENDENCIES =  \
580
-@BUILD_PLUGIN_UPTIME_TRUE@	$(am__DEPENDENCIES_1) \
581
+@BUILD_PLUGIN_UPTIME_TRUE@	$(am__DEPENDENCIES_20) \
582
 @BUILD_PLUGIN_UPTIME_TRUE@	$(am__DEPENDENCIES_1)
583
 am__uptime_la_SOURCES_DIST = uptime.c
584
 @BUILD_PLUGIN_UPTIME_TRUE@am_uptime_la_OBJECTS = uptime_la-uptime.lo
585
@@ -1476,9 +1498,9 @@ uptime_la_LINK = $(LIBTOOL) $(AM_V_lt) -
586
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uptime_la_CFLAGS) \
587
 	$(CFLAGS) $(uptime_la_LDFLAGS) $(LDFLAGS) -o $@
588
 @BUILD_PLUGIN_UPTIME_TRUE@am_uptime_la_rpath = -rpath $(pkglibdir)
589
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
590
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_21 = $(am__DEPENDENCIES_1)
591
 @BUILD_PLUGIN_USERS_TRUE@users_la_DEPENDENCIES =  \
592
-@BUILD_PLUGIN_USERS_TRUE@	$(am__DEPENDENCIES_15)
593
+@BUILD_PLUGIN_USERS_TRUE@	$(am__DEPENDENCIES_21)
594
 am__users_la_SOURCES_DIST = users.c
595
 @BUILD_PLUGIN_USERS_TRUE@am_users_la_OBJECTS = users_la-users.lo
596
 users_la_OBJECTS = $(am_users_la_OBJECTS)
597
@@ -1552,9 +1574,9 @@ write_graphite_la_LINK = $(LIBTOOL) $(AM
598
 	-o $@
599
 @BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am_write_graphite_la_rpath = -rpath \
600
 @BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@	$(pkglibdir)
601
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
602
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_22 = $(am__DEPENDENCIES_1)
603
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_DEPENDENCIES =  \
604
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__DEPENDENCIES_16)
605
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__DEPENDENCIES_22)
606
 am__write_http_la_SOURCES_DIST = write_http.c utils_format_json.c \
607
 	utils_format_json.h
608
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@am_write_http_la_OBJECTS =  \
609
@@ -1662,7 +1684,7 @@ xmms_la_LINK = $(LIBTOOL) $(AM_V_lt) --t
610
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(xmms_la_CFLAGS) \
611
 	$(CFLAGS) $(xmms_la_LDFLAGS) $(LDFLAGS) -o $@
612
 @BUILD_PLUGIN_XMMS_TRUE@am_xmms_la_rpath = -rpath $(pkglibdir)
613
-zfs_arc_la_DEPENDENCIES =
614
+@BUILD_FREEBSD_FALSE@@BUILD_LINUX_FALSE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
615
 am__zfs_arc_la_SOURCES_DIST = zfs_arc.c
616
 @BUILD_PLUGIN_ZFS_ARC_TRUE@am_zfs_arc_la_OBJECTS =  \
617
 @BUILD_PLUGIN_ZFS_ARC_TRUE@	zfs_arc_la-zfs_arc.lo
618
@@ -2124,6 +2146,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)
619
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
620
 	$(TEST_LOG_FLAGS)
621
 DIST_SUBDIRS = libcollectdclient liboconfig daemon
622
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
623
+	$(srcdir)/collectd.conf.in $(srcdir)/config.h.in \
624
+	$(top_srcdir)/libltdl/config/depcomp \
625
+	$(top_srcdir)/libltdl/config/test-driver
626
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
627
 am__relativize = \
628
   dir0=`pwd`; \
629
@@ -2154,7 +2180,6 @@ ACLOCAL = @ACLOCAL@
630
 AMTAR = @AMTAR@
631
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
632
 AR = @AR@
633
-ARGZ_H = @ARGZ_H@
634
 AUTOCONF = @AUTOCONF@
635
 AUTOHEADER = @AUTOHEADER@
636
 AUTOMAKE = @AUTOMAKE@
637
@@ -2175,6 +2200,7 @@ BUILD_WITH_LIBHIREDIS_CPPFLAGS = @BUILD_
638
 BUILD_WITH_LIBHIREDIS_LDFLAGS = @BUILD_WITH_LIBHIREDIS_LDFLAGS@
639
 BUILD_WITH_LIBIPTC_CPPFLAGS = @BUILD_WITH_LIBIPTC_CPPFLAGS@
640
 BUILD_WITH_LIBIPTC_LDFLAGS = @BUILD_WITH_LIBIPTC_LDFLAGS@
641
+BUILD_WITH_LIBKSTAT_LIBS = @BUILD_WITH_LIBKSTAT_LIBS@
642
 BUILD_WITH_LIBLDAP_CPPFLAGS = @BUILD_WITH_LIBLDAP_CPPFLAGS@
643
 BUILD_WITH_LIBLDAP_LDFLAGS = @BUILD_WITH_LIBLDAP_LDFLAGS@
644
 BUILD_WITH_LIBLVM2APP_CPPFLAGS = @BUILD_WITH_LIBLVM2APP_CPPFLAGS@
645
@@ -2326,9 +2352,11 @@ LTDLDEPS = @LTDLDEPS@
646
 LTDLINCL = @LTDLINCL@
647
 LTDLOPEN = @LTDLOPEN@
648
 LTLIBOBJS = @LTLIBOBJS@
649
+LT_ARGZ_H = @LT_ARGZ_H@
650
 LT_CONFIG_H = @LT_CONFIG_H@
651
 LT_DLLOADERS = @LT_DLLOADERS@
652
 LT_DLPREOPEN = @LT_DLPREOPEN@
653
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
654
 MAKEINFO = @MAKEINFO@
655
 MANIFEST_TOOL = @MANIFEST_TOOL@
656
 MKDIR_P = @MKDIR_P@
657
@@ -2422,11 +2450,11 @@ top_builddir = @top_builddir@
658
 top_srcdir = @top_srcdir@
659
 SUBDIRS = libcollectdclient $(am__append_1) daemon
660
 PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
661
-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
662
+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall 
663
 AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \
664
 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
665
 	-DLOCALSTATEDIR='"${localstatedir}"' \
666
-	-DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
667
+	-DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \
668
 	$(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \
669
 	-DPKGDATADIR='"${pkgdatadir}"'
670
 AUTOMAKE_OPTIONS = subdir-objects
671
@@ -2461,45 +2489,45 @@ pkglib_LTLIBRARIES = $(am__append_11) $(
672
 	$(am__append_30) $(am__append_36) $(am__append_37) \
673
 	$(am__append_38) $(am__append_41) $(am__append_44) \
674
 	$(am__append_45) $(am__append_46) $(am__append_47) \
675
-	$(am__append_55) $(am__append_56) $(am__append_57) \
676
-	$(am__append_58) $(am__append_59) $(am__append_60) \
677
-	$(am__append_61) $(am__append_62) $(am__append_63) \
678
-	$(am__append_64) $(am__append_66) $(am__append_72) \
679
-	$(am__append_73) $(am__append_74) $(am__append_75) \
680
-	$(am__append_76) $(am__append_77) $(am__append_78) \
681
-	$(am__append_82) $(am__append_83) $(am__append_84) \
682
-	$(am__append_85) $(am__append_86) $(am__append_87) \
683
-	$(am__append_88) $(am__append_89) $(am__append_90) \
684
-	$(am__append_91) $(am__append_92) $(am__append_94) \
685
-	$(am__append_95) $(am__append_96) $(am__append_98) \
686
-	$(am__append_104) $(am__append_105) $(am__append_106) \
687
-	$(am__append_107) $(am__append_110) $(am__append_111) \
688
-	$(am__append_112) $(am__append_117) $(am__append_118) \
689
-	$(am__append_119) $(am__append_122) $(am__append_123) \
690
-	$(am__append_124) $(am__append_126) $(am__append_127) \
691
-	$(am__append_128) $(am__append_130) $(am__append_131) \
692
-	$(am__append_132) $(am__append_133) $(am__append_134) \
693
-	$(am__append_136) $(am__append_137) $(am__append_138) \
694
-	$(am__append_139) $(am__append_140) $(am__append_141) \
695
-	$(am__append_143) $(am__append_145) $(am__append_146) \
696
-	$(am__append_147) $(am__append_148) $(am__append_149) \
697
-	$(am__append_150) $(am__append_151) $(am__append_152) \
698
-	$(am__append_153) $(am__append_154) $(am__append_158) \
699
-	$(am__append_159) $(am__append_166) $(am__append_167) \
700
-	$(am__append_168) $(am__append_169) $(am__append_170) \
701
-	$(am__append_171) $(am__append_172) $(am__append_173) \
702
-	$(am__append_174) $(am__append_175) $(am__append_176) \
703
-	$(am__append_178) $(am__append_179) $(am__append_180) \
704
-	$(am__append_181) $(am__append_182) $(am__append_184) \
705
-	$(am__append_185) $(am__append_186) $(am__append_189) \
706
-	$(am__append_192) $(am__append_193) $(am__append_194) \
707
-	$(am__append_195) $(am__append_196) $(am__append_197) \
708
-	$(am__append_198) $(am__append_199) $(am__append_202) \
709
-	$(am__append_203) $(am__append_204) $(am__append_205) \
710
-	$(am__append_206) $(am__append_207) $(am__append_208) \
711
-	$(am__append_209) $(am__append_210) $(am__append_211)
712
-BUILT_SOURCES = $(dist_man_MANS) $(am__append_213) $(am__append_215)
713
-CLEANFILES = $(am__append_212) $(am__append_214)
714
+	$(am__append_56) $(am__append_57) $(am__append_58) \
715
+	$(am__append_59) $(am__append_60) $(am__append_61) \
716
+	$(am__append_62) $(am__append_63) $(am__append_64) \
717
+	$(am__append_65) $(am__append_67) $(am__append_73) \
718
+	$(am__append_74) $(am__append_75) $(am__append_76) \
719
+	$(am__append_77) $(am__append_78) $(am__append_79) \
720
+	$(am__append_83) $(am__append_84) $(am__append_85) \
721
+	$(am__append_86) $(am__append_87) $(am__append_88) \
722
+	$(am__append_89) $(am__append_90) $(am__append_91) \
723
+	$(am__append_92) $(am__append_93) $(am__append_95) \
724
+	$(am__append_96) $(am__append_97) $(am__append_99) \
725
+	$(am__append_105) $(am__append_106) $(am__append_107) \
726
+	$(am__append_108) $(am__append_111) $(am__append_112) \
727
+	$(am__append_113) $(am__append_118) $(am__append_119) \
728
+	$(am__append_120) $(am__append_123) $(am__append_124) \
729
+	$(am__append_125) $(am__append_127) $(am__append_128) \
730
+	$(am__append_129) $(am__append_131) $(am__append_132) \
731
+	$(am__append_133) $(am__append_134) $(am__append_135) \
732
+	$(am__append_137) $(am__append_138) $(am__append_139) \
733
+	$(am__append_140) $(am__append_141) $(am__append_142) \
734
+	$(am__append_144) $(am__append_146) $(am__append_147) \
735
+	$(am__append_148) $(am__append_149) $(am__append_150) \
736
+	$(am__append_151) $(am__append_152) $(am__append_153) \
737
+	$(am__append_154) $(am__append_155) $(am__append_159) \
738
+	$(am__append_160) $(am__append_167) $(am__append_168) \
739
+	$(am__append_169) $(am__append_170) $(am__append_171) \
740
+	$(am__append_172) $(am__append_173) $(am__append_174) \
741
+	$(am__append_175) $(am__append_176) $(am__append_177) \
742
+	$(am__append_179) $(am__append_180) $(am__append_181) \
743
+	$(am__append_182) $(am__append_183) $(am__append_185) \
744
+	$(am__append_186) $(am__append_187) $(am__append_190) \
745
+	$(am__append_193) $(am__append_194) $(am__append_195) \
746
+	$(am__append_196) $(am__append_197) $(am__append_198) \
747
+	$(am__append_199) $(am__append_200) $(am__append_203) \
748
+	$(am__append_204) $(am__append_205) $(am__append_206) \
749
+	$(am__append_207) $(am__append_208) $(am__append_209) \
750
+	$(am__append_210) $(am__append_211) $(am__append_212)
751
+BUILT_SOURCES = $(dist_man_MANS) $(am__append_214) $(am__append_216)
752
+CLEANFILES = $(am__append_213) $(am__append_215)
753
 @BUILD_PLUGIN_AGGREGATION_TRUE@aggregation_la_SOURCES = aggregation.c \
754
 @BUILD_PLUGIN_AGGREGATION_TRUE@                         utils_vl_lookup.c utils_vl_lookup.h
755
 
756
@@ -2606,7 +2634,8 @@ CLEANFILES = $(am__append_212) $(am__app
757
 @BUILD_PLUGIN_DISK_TRUE@	$(am__append_50)
758
 @BUILD_PLUGIN_DISK_TRUE@disk_la_LIBADD = $(am__append_48) \
759
 @BUILD_PLUGIN_DISK_TRUE@	$(am__append_49) $(am__append_52) \
760
-@BUILD_PLUGIN_DISK_TRUE@	$(am__append_53) $(am__append_54)
761
+@BUILD_PLUGIN_DISK_TRUE@	$(am__append_53) $(am__append_54) \
762
+@BUILD_PLUGIN_DISK_TRUE@	$(am__append_55)
763
 @BUILD_PLUGIN_DNS_TRUE@dns_la_SOURCES = dns.c utils_dns.c utils_dns.h
764
 @BUILD_PLUGIN_DNS_TRUE@dns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
765
 @BUILD_PLUGIN_DNS_TRUE@dns_la_LIBADD = -lpcap -lpthread
766
@@ -2637,14 +2666,14 @@ CLEANFILES = $(am__append_212) $(am__app
767
 @BUILD_PLUGIN_GMOND_TRUE@gmond_la_LIBADD = $(GANGLIA_LIBS)
768
 @BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_SOURCES = hddtemp.c
769
 @BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
770
-@BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_LIBADD = $(am__append_65)
771
+@BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_LIBADD = $(am__append_66)
772
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_SOURCES = interface.c
773
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_CFLAGS = $(AM_CFLAGS) \
774
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_67)
775
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_68)
776
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_LDFLAGS = $(PLUGIN_LDFLAGS)
777
-@BUILD_PLUGIN_INTERFACE_TRUE@interface_la_LIBADD = $(am__append_68) \
778
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_69) $(am__append_70) \
779
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_71)
780
+@BUILD_PLUGIN_INTERFACE_TRUE@interface_la_LIBADD = $(am__append_69) \
781
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_70) $(am__append_71) \
782
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_72)
783
 @BUILD_PLUGIN_IPC_TRUE@ipc_la_SOURCES = ipc.c
784
 @BUILD_PLUGIN_IPC_TRUE@ipc_la_CFLAGS = $(AM_CFLAGS)
785
 @BUILD_PLUGIN_IPC_TRUE@ipc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
786
@@ -2667,10 +2696,10 @@ CLEANFILES = $(am__append_212) $(am__app
787
 @BUILD_PLUGIN_JAVA_TRUE@java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS)
788
 @BUILD_PLUGIN_JAVA_TRUE@java_la_LIBADD = $(JAVA_LIBS)
789
 @BUILD_PLUGIN_LOAD_TRUE@load_la_SOURCES = load.c
790
-@BUILD_PLUGIN_LOAD_TRUE@load_la_CFLAGS = $(AM_CFLAGS) $(am__append_79)
791
+@BUILD_PLUGIN_LOAD_TRUE@load_la_CFLAGS = $(AM_CFLAGS) $(am__append_80)
792
 @BUILD_PLUGIN_LOAD_TRUE@load_la_LDFLAGS = $(PLUGIN_LDFLAGS)
793
-@BUILD_PLUGIN_LOAD_TRUE@load_la_LIBADD = $(am__append_80) \
794
-@BUILD_PLUGIN_LOAD_TRUE@	$(am__append_81)
795
+@BUILD_PLUGIN_LOAD_TRUE@load_la_LIBADD = $(am__append_81) \
796
+@BUILD_PLUGIN_LOAD_TRUE@	$(am__append_82)
797
 @BUILD_PLUGIN_LOGFILE_TRUE@logfile_la_SOURCES = logfile.c
798
 @BUILD_PLUGIN_LOGFILE_TRUE@logfile_la_LDFLAGS = $(PLUGIN_LDFLAGS)
799
 @BUILD_PLUGIN_LOG_LOGSTASH_TRUE@log_logstash_la_SOURCES = log_logstash.c
800
@@ -2698,7 +2727,7 @@ CLEANFILES = $(am__append_212) $(am__app
801
 @BUILD_PLUGIN_MATCH_VALUE_TRUE@match_value_la_LDFLAGS = $(PLUGIN_LDFLAGS)
802
 @BUILD_PLUGIN_MBMON_TRUE@mbmon_la_SOURCES = mbmon.c
803
 @BUILD_PLUGIN_MBMON_TRUE@mbmon_la_LDFLAGS = $(PLUGIN_LDFLAGS)
804
-@BUILD_PLUGIN_MBMON_TRUE@mbmon_la_LIBADD = $(am__append_93)
805
+@BUILD_PLUGIN_MBMON_TRUE@mbmon_la_LIBADD = $(am__append_94)
806
 @BUILD_PLUGIN_MD_TRUE@md_la_SOURCES = md.c
807
 @BUILD_PLUGIN_MD_TRUE@md_la_LDFLAGS = $(PLUGIN_LDFLAGS)
808
 @BUILD_PLUGIN_MEMCACHEC_TRUE@memcachec_la_SOURCES = memcachec.c
809
@@ -2707,14 +2736,14 @@ CLEANFILES = $(am__append_212) $(am__app
810
 @BUILD_PLUGIN_MEMCACHEC_TRUE@memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS)
811
 @BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_SOURCES = memcached.c
812
 @BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_LDFLAGS = $(PLUGIN_LDFLAGS)
813
-@BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_LIBADD = $(am__append_97)
814
+@BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_LIBADD = $(am__append_98)
815
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_SOURCES = memory.c
816
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_CFLAGS = $(AM_CFLAGS) \
817
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_101)
818
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_102)
819
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
820
-@BUILD_PLUGIN_MEMORY_TRUE@memory_la_LIBADD = $(am__append_99) \
821
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_100) $(am__append_102) \
822
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_103)
823
+@BUILD_PLUGIN_MEMORY_TRUE@memory_la_LIBADD = $(am__append_100) \
824
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_101) $(am__append_103) \
825
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_104)
826
 @BUILD_PLUGIN_MIC_TRUE@mic_la_SOURCES = mic.c
827
 @BUILD_PLUGIN_MIC_TRUE@mic_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_MIC_LIBPATH)
828
 @BUILD_PLUGIN_MIC_TRUE@mic_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_MIC_CPPFLAGS)
829
@@ -2728,8 +2757,8 @@ CLEANFILES = $(am__append_212) $(am__app
830
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_SOURCES = mysql.c
831
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_LDFLAGS = $(PLUGIN_LDFLAGS)
832
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_CFLAGS = $(AM_CFLAGS) \
833
-@BUILD_PLUGIN_MYSQL_TRUE@	$(am__append_108)
834
-@BUILD_PLUGIN_MYSQL_TRUE@mysql_la_LIBADD = $(am__append_109)
835
+@BUILD_PLUGIN_MYSQL_TRUE@	$(am__append_109)
836
+@BUILD_PLUGIN_MYSQL_TRUE@mysql_la_LIBADD = $(am__append_110)
837
 @BUILD_PLUGIN_NETAPP_TRUE@netapp_la_SOURCES = netapp.c
838
 @BUILD_PLUGIN_NETAPP_TRUE@netapp_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBNETAPP_CPPFLAGS)
839
 @BUILD_PLUGIN_NETAPP_TRUE@netapp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBNETAPP_LDFLAGS)
840
@@ -2742,19 +2771,19 @@ CLEANFILES = $(am__append_212) $(am__app
841
 @BUILD_PLUGIN_NETWORK_TRUE@		     utils_fbhash.c utils_fbhash.h
842
 
843
 @BUILD_PLUGIN_NETWORK_TRUE@network_la_CPPFLAGS = $(AM_CPPFLAGS) \
844
-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_114)
845
-@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
846
 @BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_115)
847
+@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
848
+@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_116)
849
 @BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -lpthread \
850
-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_113) $(am__append_116)
851
+@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_114) $(am__append_117)
852
 @BUILD_PLUGIN_NFS_TRUE@nfs_la_SOURCES = nfs.c
853
 @BUILD_PLUGIN_NFS_TRUE@nfs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
854
 @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_SOURCES = fscache.c
855
 @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS)
856
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_SOURCES = nginx.c
857
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_CFLAGS = $(AM_CFLAGS) \
858
-@BUILD_PLUGIN_NGINX_TRUE@	$(am__append_120)
859
-@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_121)
860
+@BUILD_PLUGIN_NGINX_TRUE@	$(am__append_121)
861
+@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_122)
862
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS)
863
 @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_SOURCES = notify_desktop.c
864
 @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS)
865
@@ -2765,7 +2794,7 @@ CLEANFILES = $(am__append_212) $(am__app
866
 @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
867
 @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c
868
 @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
869
-@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_125)
870
+@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_126)
871
 @BUILD_PLUGIN_NUMA_TRUE@numa_la_SOURCES = numa.c
872
 @BUILD_PLUGIN_NUMA_TRUE@numa_la_LDFLAGS = $(PLUGIN_LDFLAGS)
873
 @BUILD_PLUGIN_NUT_TRUE@nut_la_SOURCES = nut.c
874
@@ -2774,7 +2803,7 @@ CLEANFILES = $(am__append_212) $(am__app
875
 @BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
876
 @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_SOURCES = olsrd.c
877
 @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
878
-@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_129)
879
+@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_130)
880
 @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_SOURCES = onewire.c
881
 @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_CFLAGS = $(AM_CFLAGS)
882
 @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
883
@@ -2801,7 +2830,7 @@ CLEANFILES = $(am__append_212) $(am__app
884
 @BUILD_PLUGIN_PERL_TRUE@perl_la_CFLAGS = $(AM_CFLAGS) $(PERL_CFLAGS) \
885
 @BUILD_PLUGIN_PERL_TRUE@	-DXS_VERSION=\"$(VERSION)\" \
886
 @BUILD_PLUGIN_PERL_TRUE@	-DVERSION=\"$(VERSION)\" \
887
-@BUILD_PLUGIN_PERL_TRUE@	$(am__append_135)
888
+@BUILD_PLUGIN_PERL_TRUE@	$(am__append_136)
889
 @BUILD_PLUGIN_PERL_TRUE@perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
890
 @BUILD_PLUGIN_PERL_TRUE@		$(PERL_LDFLAGS)
891
 
892
@@ -2829,12 +2858,12 @@ CLEANFILES = $(am__append_212) $(am__app
893
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_SOURCES = python.c pyconfig.c pyvalues.c cpython.h
894
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_PYTHON_CPPFLAGS)
895
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_CFLAGS = $(AM_CFLAGS) \
896
-@BUILD_PLUGIN_PYTHON_TRUE@	$(am__append_142)
897
+@BUILD_PLUGIN_PYTHON_TRUE@	$(am__append_143)
898
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_PYTHON_LDFLAGS)
899
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS)
900
 @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_SOURCES = processes.c
901
 @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LDFLAGS = $(PLUGIN_LDFLAGS)
902
-@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_144)
903
+@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_145)
904
 @BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_SOURCES = protocols.c
905
 @BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_LDFLAGS = $(PLUGIN_LDFLAGS)
906
 @BUILD_PLUGIN_REDIS_TRUE@redis_la_SOURCES = redis.c
907
@@ -2870,9 +2899,9 @@ CLEANFILES = $(am__append_212) $(am__app
908
 @BUILD_PLUGIN_SNMP_TRUE@snmp_la_SOURCES = snmp.c
909
 @BUILD_PLUGIN_SNMP_TRUE@snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
910
 @BUILD_PLUGIN_SNMP_TRUE@snmp_la_CFLAGS = $(AM_CFLAGS) \
911
-@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_155)
912
-@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_156) \
913
-@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_157)
914
+@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_156)
915
+@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_157) \
916
+@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_158)
917
 @BUILD_PLUGIN_STATSD_TRUE@statsd_la_SOURCES = statsd.c \
918
 @BUILD_PLUGIN_STATSD_TRUE@                    utils_latency.h utils_latency.c
919
 
920
@@ -2880,11 +2909,11 @@ CLEANFILES = $(am__append_212) $(am__app
921
 @BUILD_PLUGIN_STATSD_TRUE@statsd_la_LIBADD = -lpthread -lm
922
 @BUILD_PLUGIN_SWAP_TRUE@swap_la_SOURCES = swap.c
923
 @BUILD_PLUGIN_SWAP_TRUE@swap_la_CFLAGS = $(AM_CFLAGS) \
924
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_163)
925
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_164)
926
 @BUILD_PLUGIN_SWAP_TRUE@swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
927
-@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_160) \
928
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_161) $(am__append_162) \
929
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_164) $(am__append_165)
930
+@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_161) \
931
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_162) $(am__append_163) \
932
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_165) $(am__append_166)
933
 @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_SOURCES = syslog.c
934
 @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
935
 @BUILD_PLUGIN_TABLE_TRUE@table_la_SOURCES = table.c
936
@@ -2895,7 +2924,7 @@ CLEANFILES = $(am__append_212) $(am__app
937
 @BUILD_PLUGIN_TAIL_CSV_TRUE@tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS)
938
 @BUILD_PLUGIN_TAPE_TRUE@tape_la_SOURCES = tape.c
939
 @BUILD_PLUGIN_TAPE_TRUE@tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
940
-@BUILD_PLUGIN_TAPE_TRUE@tape_la_LIBADD = -lkstat -ldevinfo
941
+@BUILD_PLUGIN_TAPE_TRUE@tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo
942
 @BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@target_notification_la_SOURCES = target_notification.c
943
 @BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@target_notification_la_LDFLAGS = $(PLUGIN_LDFLAGS)
944
 @BUILD_PLUGIN_TARGET_REPLACE_TRUE@target_replace_la_SOURCES = target_replace.c
945
@@ -2908,7 +2937,7 @@ CLEANFILES = $(am__append_212) $(am__app
946
 @BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@target_v5upgrade_la_LDFLAGS = $(PLUGIN_LDFLAGS)
947
 @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_SOURCES = tcpconns.c
948
 @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
949
-@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_177)
950
+@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_178)
951
 @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_SOURCES = teamspeak2.c
952
 @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_LDFLAGS = $(PLUGIN_LDFLAGS)
953
 @BUILD_PLUGIN_TED_TRUE@ted_la_SOURCES = ted.c
954
@@ -2921,7 +2950,7 @@ CLEANFILES = $(am__append_212) $(am__app
955
 @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS)
956
 @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS)
957
 @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) \
958
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@	$(am__append_183)
959
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@	$(am__append_184)
960
 @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_SOURCES = turbostat.c
961
 @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
962
 @BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_SOURCES = unixsock.c \
963
@@ -2938,13 +2967,13 @@ CLEANFILES = $(am__append_212) $(am__app
964
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_SOURCES = uptime.c
965
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_CFLAGS = $(AM_CFLAGS)
966
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
967
-@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_187) \
968
-@BUILD_PLUGIN_UPTIME_TRUE@	$(am__append_188)
969
+@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_188) \
970
+@BUILD_PLUGIN_UPTIME_TRUE@	$(am__append_189)
971
 @BUILD_PLUGIN_USERS_TRUE@users_la_SOURCES = users.c
972
 @BUILD_PLUGIN_USERS_TRUE@users_la_CFLAGS = $(AM_CFLAGS) \
973
-@BUILD_PLUGIN_USERS_TRUE@	$(am__append_190)
974
+@BUILD_PLUGIN_USERS_TRUE@	$(am__append_191)
975
 @BUILD_PLUGIN_USERS_TRUE@users_la_LDFLAGS = $(PLUGIN_LDFLAGS)
976
-@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_191)
977
+@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_192)
978
 @BUILD_PLUGIN_UUID_TRUE@uuid_la_SOURCES = uuid.c
979
 @BUILD_PLUGIN_UUID_TRUE@uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS)
980
 @BUILD_PLUGIN_UUID_TRUE@uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS)
981
@@ -2975,9 +3004,9 @@ CLEANFILES = $(am__append_212) $(am__app
982
 
983
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
984
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_CFLAGS = $(AM_CFLAGS) \
985
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_200)
986
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD =  \
987
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_201)
988
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD =  \
989
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_202)
990
 @BUILD_PLUGIN_WRITE_KAFKA_TRUE@write_kafka_la_SOURCES = write_kafka.c \
991
 @BUILD_PLUGIN_WRITE_KAFKA_TRUE@                        utils_format_graphite.c utils_format_graphite.h \
992
 @BUILD_PLUGIN_WRITE_KAFKA_TRUE@                        utils_format_json.c utils_format_json.h \
993
@@ -3016,7 +3045,7 @@ CLEANFILES = $(am__append_212) $(am__app
994
 @BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
995
 # zfs_arc requires no library on linux
996
 # solaris
997
-@BUILD_FREEBSD_FALSE@@BUILD_LINUX_FALSE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LIBADD = -lkstat
998
+@BUILD_FREEBSD_FALSE@@BUILD_LINUX_FALSE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
999
 @BUILD_FREEBSD_TRUE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LIBADD = -lm
1000
 @BUILD_PLUGIN_ZOOKEEPER_TRUE@zookeeper_la_SOURCES = zookeeper.c
1001
 @BUILD_PLUGIN_ZOOKEEPER_TRUE@zookeeper_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1002
@@ -3077,7 +3106,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
1003
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
1004
 	$(am__cd) $(top_srcdir) && \
1005
 	  $(AUTOMAKE) --foreign src/Makefile
1006
-.PRECIOUS: Makefile
1007
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1008
 	@case '$?' in \
1009
 	  *config.status*) \
1010
@@ -4744,7 +4772,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
1011
 	if test -n "$$am__remaking_logs"; then \
1012
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
1013
 	       "recursion detected" >&2; \
1014
-	else \
1015
+	elif test -n "$$redo_logs"; then \
1016
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
1017
 	fi; \
1018
 	if $(am__make_dryrun); then :; else \
1019
@@ -5096,6 +5124,8 @@ uninstall-man: uninstall-man1 uninstall-
1020
 	uninstall-man1 uninstall-man5 uninstall-pkglibLTLIBRARIES \
1021
 	uninstall-sbinPROGRAMS
1022
 
1023
+.PRECIOUS: Makefile
1024
+
1025
 
1026
 .pod.1:
1027
 	pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
1028
@@ -5121,12 +5151,7 @@ uninstall-man: uninstall-man1 uninstall-
1029
 
1030
 install-exec-hook:
1031
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
1032
-	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
1033
-	then \
1034
-		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
1035
-	else \
1036
-		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
1037
-	fi; \
1038
+	$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
1039
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
1040
 	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
1041
 	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
(-)net-mgmt/collectd5.new/files/patch-src_disk.c (-115 lines)
Lines 43-160 Link Here
43
 #elif HAVE_LIBKSTAT
43
 #elif HAVE_LIBKSTAT
44
 	kstat_t *ksp_chain;
44
 	kstat_t *ksp_chain;
45
 
45
 
46
@@ -505,6 +527,114 @@ static int disk_read (void)
47
 	IOObjectRelease (disk_list);
48
 /* #endif HAVE_IOKIT_IOKITLIB_H */
49
 
50
+#elif KERNEL_FREEBSD
51
+	int retry, dirty;
52
+
53
+	void *snap = NULL;
54
+	struct devstat *snap_iter;
55
+
56
+	struct gident *geom_id;
57
+
58
+	const char *disk_name;
59
+	long double read_time, write_time;
60
+
61
+	for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) {
62
+		if (snap != NULL)
63
+			geom_stats_snapshot_free(snap);
64
+
65
+		/* Get a fresh copy of stats snapshot */
66
+		snap = geom_stats_snapshot_get();
67
+		if (snap == NULL) {
68
+			ERROR("disk plugin: geom_stats_snapshot_get() failed.");
69
+			return (-1);
70
+		}
71
+
72
+		/* Check if we have dirty read from this snapshot */
73
+		dirty = 0;
74
+		geom_stats_snapshot_reset(snap);
75
+		while ((snap_iter = geom_stats_snapshot_next(snap)) != NULL) {
76
+			if (snap_iter->id == NULL)
77
+				continue;
78
+			geom_id = geom_lookupid(&geom_tree, snap_iter->id);
79
+
80
+			/* New device? refresh GEOM tree */
81
+			if (geom_id == NULL) {
82
+				geom_deletetree(&geom_tree);
83
+				if (geom_gettree(&geom_tree) != 0) {
84
+					ERROR("disk plugin: geom_gettree() failed");
85
+					geom_stats_snapshot_free(snap);
86
+					return (-1);
87
+				}
88
+				geom_id = geom_lookupid(&geom_tree, snap_iter->id);
89
+			}
90
+			/*
91
+			 * This should be rare: the device come right before we take the
92
+			 * snapshot and went away right after it.  We will handle this
93
+			 * case later, so don't mark dirty but silently ignore it.
94
+			 */
95
+			if (geom_id == NULL)
96
+				continue;
97
+
98
+			/* Only collect PROVIDER data */
99
+			if (geom_id->lg_what != ISPROVIDER)
100
+				continue;
101
+
102
+			/* Only collect data when rank is 1 (physical devices) */
103
+			if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1)
104
+				continue;
105
+
106
+			/* Check if this is a dirty read quit for another try */
107
+			if (snap_iter->sequence0 != snap_iter->sequence1) {
108
+				dirty = 1;
109
+				break;
110
+			}
111
+		}
112
+	}
113
+
114
+	/* Reset iterator */
115
+	geom_stats_snapshot_reset(snap);
116
+	for (;;) {
117
+		snap_iter = geom_stats_snapshot_next(snap);
118
+		if (snap_iter == NULL)
119
+			break;
120
+
121
+		if (snap_iter->id == NULL)
122
+			continue;
123
+		geom_id = geom_lookupid(&geom_tree, snap_iter->id);
124
+		if (geom_id == NULL)
125
+			continue;
126
+		if (geom_id->lg_what != ISPROVIDER)
127
+			continue;
128
+		if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1)
129
+			continue;
130
+		/* Skip dirty reads, if present */
131
+		if (dirty && (snap_iter->sequence0 != snap_iter->sequence1))
132
+			continue;
133
+
134
+		disk_name = ((struct gprovider *)geom_id->lg_ptr)->lg_name;
135
+
136
+		if ((snap_iter->bytes[1] != 0) || (snap_iter->bytes[2] != 0)) {
137
+			disk_submit(disk_name, "disk_octets",
138
+					(derive_t)snap_iter->bytes[1],
139
+					(derive_t)snap_iter->bytes[2]);
140
+		}
141
+
142
+		if ((snap_iter->operations[1] != 0) || (snap_iter->operations[2] != 0)) {
143
+			disk_submit(disk_name, "disk_ops",
144
+					(derive_t)snap_iter->operations[1],
145
+					(derive_t)snap_iter->operations[2]);
146
+		}
147
+
148
+		read_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_READ], NULL);
149
+		write_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_WRITE], NULL);
150
+		if ((read_time != 0) || (write_time != 0)) {
151
+			disk_submit (disk_name, "disk_time",
152
+					(derive_t)(read_time*1000), (derive_t)(write_time*1000));
153
+		}
154
+	}
155
+	geom_stats_snapshot_free(snap);
156
+/* #endif KERNEL_FREEBSD */
157
+
158
 #elif KERNEL_LINUX
159
 	FILE *fh;
160
 	char buffer[1024];
(-)net-mgmt/collectd5.new/files/patch-src_zfs__arc.c (-1 / +1 lines)
Lines 4-10 Link Here
4
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
4
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
5
 #if __FreeBSD__
5
 #if __FreeBSD__
6
 	za_read_derive (ksp, "allocated","cache_operation", "allocated");
6
 	za_read_derive (ksp, "allocated","cache_operation", "allocated");
7
+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501)
7
+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002000)
8
+	/* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */
8
+	/* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */
9
 	za_read_derive (ksp, "stolen",   "cache_operation", "stolen");
9
 	za_read_derive (ksp, "stolen",   "cache_operation", "stolen");
10
 #endif
10
 #endif
(-)net-mgmt/collectd5.new/pkg-plist (+1 lines)
Lines 100-105 Link Here
100
%%MONGODB%%lib/collectd/write_mongodb.so
100
%%MONGODB%%lib/collectd/write_mongodb.so
101
%%REDIS%%lib/collectd/write_redis.so
101
%%REDIS%%lib/collectd/write_redis.so
102
%%RIEMANN%%lib/collectd/write_riemann.so
102
%%RIEMANN%%lib/collectd/write_riemann.so
103
%%TSDB%%lib/collectd/write_tsdb.so
103
%%XMMS%%lib/collectd/xmms.so
104
%%XMMS%%lib/collectd/xmms.so
104
lib/collectd/zfs_arc.so
105
lib/collectd/zfs_arc.so
105
%%ZOOKEEPER%%lib/collectd/zookeeper.so
106
%%ZOOKEEPER%%lib/collectd/zookeeper.so

Return to bug 208738