Merge branch 'collectd-5.5'

diff --combined src/Makefile.am
index 956d772,dc07cb7..d54094f
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -6,6 -6,10 +6,6 @@@ SUBDIRS += daemo
  
  PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
  
 -if COMPILER_IS_GCC
 -AM_CFLAGS = -Wall -Werror
 -endif
 -
  AM_CPPFLAGS = -I$(srcdir)/daemon
  AM_CPPFLAGS += -DPREFIX='"${prefix}"'
  AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
@@@ -17,37 -21,15 +17,37 @@@ endi
  AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
  AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
  
 -AUTOMAKE_OPTIONS = subdir-objects
 +noinst_LTLIBRARIES =
 +check_PROGRAMS =
 +TESTS =
  
 -noinst_LTLIBRARIES = libmount.la liblookup.la
 -
 -libmount_la_SOURCES = utils_mount.c utils_mount.h
 -libmount_la_LIBADD = daemon/libcommon.la
 +noinst_LTLIBRARIES += liblatency.la
 +liblatency_la_SOURCES = utils_latency.c utils_latency.h
 +check_PROGRAMS += test_utils_latency
 +TESTS += test_utils_latency
 +test_utils_latency_SOURCES = utils_latency_test.c testing.h
 +test_utils_latency_LDADD = liblatency.la daemon/libplugin_mock.la -lm
  
 +noinst_LTLIBRARIES += liblookup.la
  liblookup_la_SOURCES = utils_vl_lookup.c utils_vl_lookup.h
 -liblookup_la_LIBADD = daemon/libavltree.la daemon/libcommon.la
 +liblookup_la_LIBADD = daemon/libavltree.la
 +check_PROGRAMS += test_utils_vl_lookup
 +TESTS += test_utils_vl_lookup
 +test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c testing.h
 +test_utils_vl_lookup_LDADD = liblookup.la daemon/libplugin_mock.la
 +if BUILD_WITH_LIBKSTAT
 +test_utils_vl_lookup_LDADD += -lkstat
 +endif
 +
 +noinst_LTLIBRARIES += libmount.la
 +libmount_la_SOURCES = utils_mount.c utils_mount.h
 +check_PROGRAMS += test_utils_mount
 +TESTS += test_utils_mount
 +test_utils_mount_SOURCES = utils_mount_test.c testing.h
 +test_utils_mount_LDADD = libmount.la daemon/libplugin_mock.la
 +if BUILD_WITH_LIBKSTAT
 +test_utils_mount_LDADD += -lkstat
 +endif
  
  sbin_PROGRAMS = collectdmon
  bin_PROGRAMS = collectd-nagios collectdctl collectd-tg
@@@ -95,7 -77,7 +95,7 @@@ if BUILD_AI
  collectd_tg_LDADD += -lm
  endif
  if BUILD_WITH_LIBPTHREAD
 -collectd_tg_LDADD += -lpthread
 +collectd_tg_LDADD += $(PTHREAD_LIBS)
  endif
  collectd_tg_LDADD += libcollectdclient/libcollectdclient.la
  collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
@@@ -118,7 -100,7 +118,7 @@@ if BUILD_PLUGIN_AMQ
  pkglib_LTLIBRARIES += amqp.la
  amqp_la_SOURCES = amqp.c \
                  utils_cmd_putval.c utils_cmd_putval.h \
 -                utils_parse_option.c utils_parse_option.h \
 +                utils_parse_option.c utils_parse_option.h \
                  utils_format_graphite.c utils_format_graphite.h \
                  utils_format_json.c utils_format_json.h
  amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
@@@ -335,11 -317,8 +335,11 @@@ endi
  if BUILD_WITH_LIBUDEV
  disk_la_CFLAGS += $(BUILD_WITH_LIBUDEV_CFLAGS)
  disk_la_LDFLAGS += $(BUILD_WITH_LIBUDEV_LDFLAGS)
- disk_la_LIBADD += $(BULD_WITH_LIBUDEV_LIBS)
+ disk_la_LIBADD += $(BUILD_WITH_LIBUDEV_LIBS)
  endif
 +if BUILD_FREEBSD
 +disk_la_LIBADD += -ldevstat -lgeom
 +endif
  if BUILD_WITH_PERFSTAT
  disk_la_LIBADD += -lperfstat
  endif
@@@ -349,20 -328,21 +349,20 @@@ if BUILD_PLUGIN_DN
  pkglib_LTLIBRARIES += dns.la
  dns_la_SOURCES = dns.c utils_dns.c utils_dns.h
  dns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -dns_la_LIBADD = -lpcap -lpthread
 +dns_la_LIBADD = $(PTHREAD_LIBS) -lpcap
  endif
  
  if BUILD_PLUGIN_DRBD
  pkglib_LTLIBRARIES += drbd.la
  drbd_la_SOURCES = drbd.c
  drbd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -drbd_la_LIBADD = -lpthread
  endif
  
  if BUILD_PLUGIN_EMAIL
  pkglib_LTLIBRARIES += email.la
  email_la_SOURCES = email.c
  email_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -email_la_LIBADD = -lpthread
 +email_la_LIBADD = $(PTHREAD_LIBS)
  endif
  
  if BUILD_PLUGIN_ENTROPY
@@@ -378,7 -358,7 +378,7 @@@ exec_la_SOURCES = exec.c 
                  utils_cmd_putval.c utils_cmd_putval.h \
                  utils_parse_option.h utils_parse_option.c
  exec_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -exec_la_LIBADD = -lpthread
 +exec_la_LIBADD = $(PTHREAD_LIBS)
  endif
  
  if BUILD_PLUGIN_ETHSTAT
@@@ -467,8 -447,6 +467,8 @@@ pkglib_LTLIBRARIES += ipvs.l
  ipvs_la_SOURCES = ipvs.c
  if IP_VS_H_NEEDS_KERNEL_CFLAGS
  ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
 +else
 +ipvs_la_CFLAGS = $(AM_CFLAGS)
  endif
  ipvs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
@@@ -485,7 -463,7 +485,7 @@@ java_la_SOURCES = java.
  java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_CPPFLAGS)
  java_la_CFLAGS = $(AM_CFLAGS) $(JAVA_CFLAGS)
  java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS)
 -java_la_LIBADD = $(JAVA_LIBS)
 +java_la_LIBADD = $(PTHREAD_LIBS) $(JAVA_LIBS)
  endif
  
  if BUILD_PLUGIN_LOAD
@@@ -639,14 -617,6 +639,14 @@@ modbus_la_CFLAGS = $(AM_CFLAGS) $(BUILD
  modbus_la_LIBADD = $(BUILD_WITH_LIBMODBUS_LIBS)
  endif
  
 +if BUILD_PLUGIN_MQTT
 +pkglib_LTLIBRARIES += mqtt.la
 +mqtt_la_SOURCES = mqtt.c
 +mqtt_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMOSQUITTO_CPPFLAGS)
 +mqtt_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMOSQUITTO_LDFLAGS)
 +mqtt_la_LIBADD = $(BUILD_WITH_LIBMOSQUITTO_LIBS)
 +endif
 +
  if BUILD_PLUGIN_MULTIMETER
  pkglib_LTLIBRARIES += multimeter.la
  multimeter_la_SOURCES = multimeter.c
@@@ -687,7 -657,7 +687,7 @@@ network_la_SOURCES = network.c network.
                     utils_fbhash.c utils_fbhash.h
  network_la_CPPFLAGS = $(AM_CPPFLAGS)
  network_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -network_la_LIBADD = -lpthread
 +network_la_LIBADD = $(PTHREAD_LIBS)
  if BUILD_WITH_LIBSOCKET
  network_la_LIBADD += -lsocket
  endif
@@@ -734,13 -704,7 +734,13 @@@ if BUILD_PLUGIN_NOTIFY_EMAI
  pkglib_LTLIBRARIES += notify_email.la
  notify_email_la_SOURCES = notify_email.c
  notify_email_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
 +notify_email_la_LIBADD = $(PTHREAD_LIBS) -lesmtp -lssl -lcrypto
 +endif
 +
 +if BUILD_PLUGIN_NOTIFY_NAGIOS
 +pkglib_LTLIBRARIES += notify_nagios.la
 +notify_nagios_la_SOURCES = notify_nagios.c
 +notify_nagios_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
  if BUILD_PLUGIN_NTPD
@@@ -764,7 -728,7 +764,7 @@@ pkglib_LTLIBRARIES += nut.l
  nut_la_SOURCES = nut.c
  nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
  nut_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
 +nut_la_LIBADD = $(PTHREAD_LIBS) $(BUILD_WITH_LIBUPSCLIENT_LIBS)
  endif
  
  if BUILD_PLUGIN_OLSRD
@@@ -783,7 -747,7 +783,7 @@@ onewire_la_SOURCES = onewire.
  onewire_la_CFLAGS = $(AM_CFLAGS)
  onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
  onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS)
 -onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBOWCAPI_LDFLAGS)
  endif
  
  if BUILD_PLUGIN_OPENLDAP
@@@ -971,15 -935,16 +971,15 @@@ snmp_la_CFLAGS += $(BUILD_WITH_LIBSNMP_
  snmp_la_LIBADD += $(BUILD_WITH_LIBSNMP_LIBS)
  endif
  if BUILD_WITH_LIBPTHREAD
 -snmp_la_LIBADD += -lpthread
 +snmp_la_LIBADD += $(PTHREAD_LIBS)
  endif
  endif
  
  if BUILD_PLUGIN_STATSD
  pkglib_LTLIBRARIES += statsd.la
 -statsd_la_SOURCES = statsd.c \
 -                    utils_latency.h utils_latency.c
 +statsd_la_SOURCES = statsd.c
  statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -statsd_la_LIBADD = -lpthread -lm
 +statsd_la_LIBADD = $(PTHREAD_LIBS) liblatency.la -lm
  endif
  
  if BUILD_PLUGIN_SWAP
@@@ -1130,7 -1095,7 +1130,7 @@@ unixsock_la_SOURCES = unixsock.c 
                      utils_cmd_putnotif.h utils_cmd_putnotif.c \
                      utils_parse_option.h utils_parse_option.c
  unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -unixsock_la_LIBADD = -lpthread
 +unixsock_la_LIBADD = $(PTHREAD_LIBS)
  endif
  
  if BUILD_PLUGIN_UPTIME
@@@ -1261,8 -1226,9 +1261,8 @@@ endi
  if BUILD_PLUGIN_WRITE_RIEMANN
  pkglib_LTLIBRARIES += write_riemann.la
  write_riemann_la_SOURCES = write_riemann.c write_riemann_threshold.c write_riemann_threshold.h
 -nodist_write_riemann_la_SOURCES = riemann.pb-c.c riemann.pb-c.h
 -write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -write_riemann_la_LIBADD = -lprotobuf-c
 +write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBRIEMANN_CLIENT_LIBS)
 +write_riemann_la_CFLAGS = $(AM_CFLAGS) $(LIBRIEMANN_CLIENT_CFLAGS)
  endif
  
  if BUILD_PLUGIN_WRITE_SENSU
@@@ -1277,13 -1243,6 +1277,13 @@@ write_tsdb_la_SOURCES = write_tsdb.
  write_tsdb_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
 +if BUILD_PLUGIN_XENCPU
 +pkglib_LTLIBRARIES += xencpu.la
 +xencpu_la_SOURCES = xencpu.c
 +xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +xencpu_la_LIBADD = -lxenctrl
 +endif
 +
  if BUILD_PLUGIN_XMMS
  pkglib_LTLIBRARIES += xmms.la
  xmms_la_SOURCES = xmms.c
@@@ -1317,13 -1276,6 +1317,13 @@@ endi
  
  BUILT_SOURCES += $(dist_man_MANS)
  
 +if BUILD_PLUGIN_ZONE
 +pkglib_LTLIBRARIES += zone.la
 +zone_la_SOURCES = zone.c
 +zone_la_CFLAGS = $(AM_CFLAGS)
 +zone_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +endif
 +
  dist_man_MANS = collectd.1 \
                collectd.conf.5 \
                collectd-email.5 \
@@@ -1392,6 -1344,17 +1392,6 @@@ pinba.pb-c.c pinba.pb-c.h: pinba.prot
        $(AM_V_PROTOC_C)protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto
  endif
  
 -# Protocol buffer for the "write_riemann" plugin.
 -EXTRA_DIST += riemann.proto
 -if BUILD_PLUGIN_WRITE_RIEMANN
 -CLEANFILES += riemann.pb-c.c riemann.pb-c.h
 -
 -BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h
 -
 -riemann.pb-c.c riemann.pb-c.h: riemann.proto
 -      $(AM_V_PROTOC_C)protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
 -endif
 -
  install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
        if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
@@@ -1410,11 -1373,27 +1410,11 @@@ uninstall-hook
        rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
        rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
  
 -check_PROGRAMS = test_utils_mount test_utils_vl_lookup
 -
 -test_utils_mount_SOURCES = utils_mount_test.c testing.h
 -test_utils_mount_LDADD = libmount.la daemon/libplugin_mock.la
 -if BUILD_WITH_LIBKSTAT
 -test_utils_mount_LDADD += -lkstat
 -endif
 -
 -test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c testing.h
 -test_utils_vl_lookup_LDADD = liblookup.la daemon/libplugin_mock.la
 -if BUILD_WITH_LIBKSTAT
 -test_utils_vl_lookup_LDADD += -lkstat
 -endif
 -
 -TESTS = test_utils_mount test_utils_vl_lookup
 -
  if BUILD_PLUGIN_CEPH
  test_plugin_ceph_SOURCES = ceph_test.c
  test_plugin_ceph_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
  test_plugin_ceph_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 -test_plugin_ceph_LDADD = daemon/libcommon.la daemon/libplugin_mock.la $(BUILD_WITH_LIBYAJL_LIBS)
 +test_plugin_ceph_LDADD = daemon/libplugin_mock.la $(BUILD_WITH_LIBYAJL_LIBS)
  check_PROGRAMS += test_plugin_ceph
  TESTS += test_plugin_ceph
  endif