Merge branch 'collectd-4.4'

Conflicts:

	configure.in

diff --cc configure.in
index e63ee213b81a2079f80467bb62a7d98dc2c84de6,8ca5d6913b0ee47507a64e666faa091a252517c2..1f2d979ea1c1ff0417b26da4ec0971d038d5908d
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1235,14 -1232,7 +1235,15 @@@ the
    AC_SUBST(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
  fi
  
+ with_libkvm="no"
 +AC_CHECK_LIB(kvm, kvm_getprocs, [with_kvm_getprocs="yes"], [with_kvm_getprocs="no"])
 +if test "x$with_kvm_getprocs" = "xyes"
 +then
 +      AC_DEFINE(HAVE_LIBKVM_GETPROCS, 1,
 +                [Define to 1 if you have the 'kvm' library with the 'kvm_getprocs' symbol (-lkvm)])
 +fi
 +AM_CONDITIONAL(BUILD_WITH_LIBKVM_GETPROCS, test "x$with_kvm_getprocs" = "xyes")
 +
  AC_CHECK_LIB(kvm, kvm_getswapinfo, [with_kvm_getswapinfo="yes"], [with_kvm_getswapinfo="no"])
  if test "x$with_kvm_getswapinfo" = "xyes"
  then
@@@ -2641,9 -2442,8 +2643,9 @@@ the
        plugin_processes="yes"
  fi
  
- if test "x$with_libkvm" = "xyes"
+ if test "x$with_kvm_getswapinfo" = "xyes"
  then
 +      plugin_processes="yes"
        plugin_swap="yes"
  fi