Merge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2

diff --cc configure.in
index 62f70e132a962c9a96145a9278e524172fa7868e,b5138a2670fd0d178211007814e2d55318596b8e..ae11ecfae7b7d3e6e73847e8dbf5b5e5a6f205c4
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1087,13 -1091,14 +1091,15 @@@ AC_CHECK_LIB(IOKit, IOServiceGetMatchin
  AC_DEFINE_UNQUOTED(COLLECT_LIBIOKIT, [$collect_libiokit], [Wether or not to use the IOKit library])
  AM_CONDITIONAL(BUILD_WITH_LIBIOKIT, test "x$with_libiokit" = "xyes")
  
+ with_libstatgrab_cflags=""
+ with_libstatgrab_ldflags=""
  AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])],
  [
 -      if test "x$withval" != "xno" -a "x$withval" != "xyes"
 +      if test "x$withval" != "xno" \
 +              && test "x$withval" != "xyes"
        then
-               LDFLAGS="$LDFLAGS -L$withval/lib"
-               CPPFLAGS="$CPPFLAGS -I$withval/include"
+               with_libstatgrab_cflags="-I$withval/include"
+               with_libstatgrab_ldflags="-L$withval/lib"
                with_libstatgrab="yes"
        fi
  ],