From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 19 Aug 2008 07:46:34 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~74
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=efbeffe4cc730d6e14ba45dddfee9ab5229f07dc;p=collectd.git

Merge branch 'collectd-4.4'

Conflicts:

	configure.in
---

efbeffe4cc730d6e14ba45dddfee9ab5229f07dc
diff --cc configure.in
index e63ee213,8ca5d691..1f2d979e
--- a/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