Merge branch 'pull/collectd-4.1' into collectd-4.1

diff --cc configure.in
index 8544ca467b2299897f6dbccc32690e9fb16f4090,252d16ff202cb8ec3a7f9dbe918d21ef1ec11f5c..68299545764d47e5065d2819a1d481588d0ef0fa
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1431,10 -1425,15 +1425,16 @@@ the
        SAVE_CFLAGS=$CFLAGS
        CFLAGS="$CFLAGS $with_libnetlink_cflags"
  
-       AC_CHECK_HEADERS(iproute/libnetlink.h, [], [with_libnetlink="no (iproute/libnetlink.h not found)"],
+       with_libnetlink="no (libnetlink.h not found)"
+ 
+       AC_CHECK_HEADERS(libnetlink.h iproute/libnetlink.h linux/libnetlink.h,
+       [
+        with_libnetlink="yes"
+        break
+       ], [],
  [#include <stdio.h>
  #include <sys/types.h>
 +#include <asm/types.h>
  #include <sys/socket.h>
  #include <linux/netlink.h>
  #include <linux/rtnetlink.h>])