From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 5 Mar 2017 16:21:11 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~220
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=9717b1a55d60d992c16e66e2ae5bdfb42f80aca8;hp=79a94204db8de144bf5bd84159afde444df9e0a4

Merge branch 'collectd-5.7'

Conflicts:
	configure.ac
---

diff --git a/configure.ac b/configure.ac
index 63cfca77..3b932ca3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -592,6 +592,14 @@ if test "x$ac_system" = "xLinux"; then
   fi
 
   if test "x$have_capability" = "xyes"; then
+    AC_CHECK_DECL([CAP_IS_SUPPORTED],
+      [have_capability="yes"],
+      [have_capability="no (CAP_IS_SUPPORTED not found)"],
+      [[#include <sys/capability.h>]]
+    )
+  fi
+
+  if test "x$have_capability" = "xyes"; then
     AC_DEFINE([HAVE_CAPABILITY], [1], [Define to 1 if you have cap_get_proc() (-lcap).])
   fi