Merge branch 'collectd-5.3' into collectd-5.4

diff --combined src/Makefile.am
index 405d4ae,c24e738..c80f4bf
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -196,16 -196,6 +196,16 @@@ collectd_LDADD += "-dlopen" apple_senso
  collectd_DEPENDENCIES += apple_sensors.la
  endif
  
 +if BUILD_PLUGIN_AQUAERO
 +pkglib_LTLIBRARIES += aquaero.la
 +aquaero_la_SOURCES = aquaero.c
 +aquaero_la_LDFLAGS = -module -avoid-version
 +aquaero_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBAQUAERO5_CFLAGS)
 +aquaero_la_LIBADD = $(BUILD_WITH_LIBAQUAERO5_LDFLAGS) -laquaero5
 +collectd_LDADD += "-dlopen" aquaero.la
 +collectd_DEPENDENCIES += aquaero.la
 +endif
 +
  if BUILD_PLUGIN_ASCENT
  pkglib_LTLIBRARIES += ascent.la
  ascent_la_SOURCES = ascent.c
@@@ -240,14 -230,6 +240,14 @@@ collectd_LDADD += "-dlopen" bind.l
  collectd_DEPENDENCIES += bind.la
  endif
  
 +if BUILD_PLUGIN_CGROUPS
 +pkglib_LTLIBRARIES += cgroups.la
 +cgroups_la_SOURCES = cgroups.c utils_mount.c utils_mount.h
 +cgroups_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" cgroups.la
 +collectd_DEPENDENCIES += cgroups.la
 +endif
 +
  if BUILD_PLUGIN_CONNTRACK
  pkglib_LTLIBRARIES += conntrack.la
  conntrack_la_SOURCES = conntrack.c
@@@ -586,15 -568,6 +586,15 @@@ collectd_DEPENDENCIES += lpar.l
  lpar_la_LIBADD = -lperfstat
  endif
  
 +if BUILD_PLUGIN_LVM
 +pkglib_LTLIBRARIES += lvm.la
 +lvm_la_SOURCES = lvm.c
 +lvm_la_LDFLAGS = -module -avoid-version
 +lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS)
 +collectd_LDADD += "-dlopen" lvm.la
 +collectd_DEPENDENCIES += lvm.la
 +endif
 +
  if BUILD_PLUGIN_MADWIFI
  pkglib_LTLIBRARIES += madwifi.la
  madwifi_la_SOURCES = madwifi.c madwifi.h
@@@ -754,8 -727,8 +754,8 @@@ if BUILD_PLUGIN_NETLIN
  pkglib_LTLIBRARIES += netlink.la
  netlink_la_SOURCES = netlink.c
  netlink_la_LDFLAGS = -module -avoid-version
 -netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBNETLINK_CFLAGS)
 -netlink_la_LIBADD = $(BUILD_WITH_LIBNETLINK_LIBS)
 +netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
 +netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
  collectd_LDADD += "-dlopen" netlink.la
  collectd_DEPENDENCIES += netlink.la
  endif
@@@ -823,7 -796,7 +823,7 @@@ if BUILD_PLUGIN_NOTIFY_EMAI
  pkglib_LTLIBRARIES += notify_email.la
  notify_email_la_SOURCES = notify_email.c
  notify_email_la_LDFLAGS = -module -avoid-version
- notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
+ notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
  collectd_LDADD += "-dlopen" notify_email.la
  collectd_DEPENDENCIES += notify_email.la
  endif
@@@ -1063,16 -1036,6 +1063,16 @@@ collectd_LDADD += "-dlopen" serial.l
  collectd_DEPENDENCIES += serial.la
  endif
  
 +if BUILD_PLUGIN_SIGROK
 +pkglib_LTLIBRARIES += sigrok.la
 +sigrok_la_SOURCES = sigrok.c
 +sigrok_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBSIGROK_CFLAGS)
 +sigrok_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBSIGROK_LDFLAGS)
 +sigrok_la_LIBADD = -lsigrok
 +collectd_LDADD += "-dlopen" sigrok.la
 +collectd_DEPENDENCIES += sigrok.la
 +endif
 +
  if BUILD_PLUGIN_SNMP
  pkglib_LTLIBRARIES += snmp.la
  snmp_la_SOURCES = snmp.c
@@@ -1090,16 -1053,6 +1090,16 @@@ collectd_LDADD += "-dlopen" snmp.l
  collectd_DEPENDENCIES += snmp.la
  endif
  
 +if BUILD_PLUGIN_STATSD
 +pkglib_LTLIBRARIES += statsd.la
 +statsd_la_SOURCES = statsd.c \
 +                    utils_latency.h utils_latency.c
 +statsd_la_LDFLAGS = -module -avoid-version
 +statsd_la_LIBADD = -lpthread
 +collectd_LDADD += "-dlopen" statsd.la
 +collectd_DEPENDENCIES += statsd.la
 +endif
 +
  if BUILD_PLUGIN_SWAP
  pkglib_LTLIBRARIES += swap.la
  swap_la_SOURCES = swap.c
@@@ -1319,16 -1272,6 +1319,16 @@@ collectd_LDADD += "-dlopen" uuid.l
  collectd_DEPENDENCIES += uuid.la
  endif
  
 +if BUILD_PLUGIN_MIC
 +pkglib_LTLIBRARIES += mic.la
 +mic_la_SOURCES = mic.c
 +mic_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_MIC_LIBPATH)
 +mic_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_MIC_CPPFLAGS)
 +mic_la_LIBADD = $(BUILD_WITH_MIC_LDADD)
 +collectd_LDADD += "-dlopen" mic.la
 +collectd_DEPENDENCIES += mic.la
 +endif
 +
  if BUILD_PLUGIN_VARNISH
  pkglib_LTLIBRARIES += varnish.la
  varnish_la_SOURCES = varnish.c
@@@ -1433,11 -1376,7 +1433,11 @@@ pkglib_LTLIBRARIES += zfs_arc.l
  zfs_arc_la_SOURCES = zfs_arc.c
  zfs_arc_la_CFLAGS = $(AM_CFLAGS)
  zfs_arc_la_LDFLAGS = -module -avoid-version
 +if BUILD_FREEBSD
 +zfs_arc_la_LIBADD = -lm
 +else
  zfs_arc_la_LIBADD = -lkstat
 +endif
  collectd_LDADD += "-dlopen" zfs_arc.la
  collectd_DEPENDENCIES += zfs_arc.la
  endif