Merge branch 'collectd-5.7'

Conflicts:
	configure.ac

diff --git a/configure.ac b/configure.ac
index 63cfca7..3b932ca 100644 (file)
--- 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