Merge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3

diff --combined configure.in
index 75ac61534f37695c28fbb693f0ac99cf5898b2dc,cd2110f70db68804e6c57b0238e38ace6d2e2959..9e6557c474d967d8b1c7fb3a2f489056134df073
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -29,7 -29,6 +29,7 @@@ AC_LIBTOOL_DLOPE
  AC_PROG_LIBTOOL
  AC_PROG_LEX
  AC_PROG_YACC
 +PKG_PROG_PKG_CONFIG
  AC_CONFIG_SUBDIRS(libltdl)
  
  AC_MSG_CHECKING([for kernel type ($host_os)])
@@@ -373,6 -372,68 +373,68 @@@ AC_CHECK_FUNCS(gettimeofday select strd
  
  AC_FUNC_STRERROR_R
  
+ AC_CACHE_CHECK([for strtok_r],
+   [have_strtok_r_default],
+   AC_LINK_IFELSE(
+     AC_LANG_PROGRAM(
+     [[[[
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+     ]]]],
+     [[[[
+       char buffer[] = "foo,bar,baz";
+       char *token;
+       char *dummy;
+       char *saveptr;
+ 
+       dummy = buffer;
+       saveptr = NULL;
+       while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
+       {
+       dummy = NULL;
+         printf ("token = %s;\n", token);
+       }
+     ]]]]),
+     [have_strtok_r_default="yes"],
+     [have_strtok_r_default="no"]
+   )
+ )
+ 
+ if test "x$have_strtok_r_default" = "xno"
+ then
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -D_REENTRANT=1"
+ 
+   AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
+     [have_strtok_r_reentrant],
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+       [[[[
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+       ]]]],
+       [[[[
+         char buffer[] = "foo,bar,baz";
+         char *token;
+         char *dummy;
+         char *saveptr;
+ 
+         dummy = buffer;
+         saveptr = NULL;
+         while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
+         {
+         dummy = NULL;
+           printf ("token = %s;\n", token);
+         }
+       ]]]]),
+       [have_strtok_r_reentrant="yes"],
+       [AC_MSG_FAILURE([strtok_r isn't available. Please file a bugreport!])]
+     )
+   )
+ fi
+ 
  AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
  
  socket_needs_socket="no"
@@@ -812,9 -873,6 +874,9 @@@ AC_CHECK_MEMBERS([kstat_io_t.nwritten, 
  #endif
        ])
  
 +#
 +# Checks for libraries begin here
 +#
  with_libresolv="yes"
  AC_CHECK_LIB(resolv, res_search,
  [
@@@ -1046,14 -1104,12 +1108,14 @@@ 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"
        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"
        else
                with_libstatgrab="$withval"
@@@ -1067,93 -1123,28 +1129,93 @@@
                with_libstatgrab="no"
        fi
  ])
 -if test "x$with_libstatgrab" = "xyes"
 +with_libstatgrab_pkg_config="yes"
 +if test "x$with_libstatgrab" = "xyes" \
 +  && test "x$PKG_CONFIG" != "x"
  then
 -      AC_CHECK_LIB(statgrab, sg_init, [with_libstatgrab="yes"], [with_libstatgrab="no (libstatgrab not found)"])
 +  AC_MSG_CHECKING([pkg-config for libstatgrab])
 +  temp_result="found"
 +  $PKG_CONFIG --exists libstatgrab 2>/dev/null
 +  if test "$?" != "0"
 +  then
 +    with_libstatgrab_pkg_config="no"
 +    temp_result="not found"
 +  fi
 +  AC_MSG_RESULT([$temp_result])
 +else
 +  AC_MSG_NOTICE([pkg-config not available, trying to guess flags for the statgrab library.])
 +  with_libstatgrab_pkg_config="no"
 +  with_libstatgrab_ldflags="$with_libstatgrab_ldflags -lstatgrab"
  fi
 -if test "x$with_libstatgrab" = "xyes"
 +
 +if test "x$with_libstatgrab" = "xyes" \
 +  && test "x$with_libstatgrab_pkg_config" = "xyes" \
 +  && test "x$with_libstatgrab_cflags" = "x"
  then
 -      AC_CHECK_HEADERS(statgrab.h,,    [with_libstatgrab="no (statgrab.h not found)"])
 +  AC_MSG_CHECKING([for libstatgrab CFLAGS])
 +  temp_result="`$PKG_CONFIG --cflags libstatgrab`"
 +  if test "$?" = "0"
 +  then
 +    with_libstatgrab_cflags="$temp_result"
 +  else
 +    with_libstatgrab="no ($PKG_CONFIG --cflags libstatgrab failed)"
 +    temp_result="$PKG_CONFIG --cflags libstatgrab failed"
 +  fi
 +  AC_MSG_RESULT([$temp_result])
  fi
 +
 +if test "x$with_libstatgrab" = "xyes" \
 +  && test "x$with_libstatgrab_pkg_config" = "xyes" \
 +  && test "x$with_libstatgrab_ldflags" = "x"
 +then
 +  AC_MSG_CHECKING([for libstatgrab LDFLAGS])
 +  temp_result="`$PKG_CONFIG --libs libstatgrab`"
 +  if test "$?" = "0"
 +  then
 +    with_libstatgrab_ldflags="$temp_result"
 +  else
 +    with_libstatgrab="no ($PKG_CONFIG --libs libstatgrab failed)"
 +    temp_result="$PKG_CONFIG --libs libstatgrab failed"
 +  fi
 +  AC_MSG_RESULT([$temp_result])
 +fi
 +
  if test "x$with_libstatgrab" = "xyes"
  then
 -      AC_CHECK_LIB(devstat, getdevs, [with_libdevstat="yes"], [with_libdevstat="no"])
 +  SAVE_CPPFLAGS="$CPPFLAGS"
 +  CPPFLAGS="$CPPFLAGS $with_libstatgrab_cflags"
 +
 +  AC_CHECK_HEADERS(statgrab.h,
 +                 [with_libstatgrab="yes"],
 +                 [with_libstatgrab="no (statgrab.h not found)"])
 +
 +  CPPFLAGS="$SAVE_CPPFLAGS"
  fi
 +
  if test "x$with_libstatgrab" = "xyes"
  then
 -      collect_libstatgrab=1
 -else
 -      collect_libstatgrab=0
 +  SAVE_CFLAGS="$CFLAGS"
 +  SAVE_LDFLAGS="$LDFLAGS"
 +
 +  CFLAGS="$CFLAGS $with_libstatgrab_cflags"
 +  LDFLAGS="$LDFLAGS $with_libstatgrab_ldflags"
 +
 +  AC_CHECK_LIB(statgrab, sg_init,
 +             [with_libstatgrab="yes"],
 +             [with_libstatgrab="no (symbol sg_init not found)"])
 +
 +  CFLAGS="$SAVE_CFLAGS"
 +  LDFLAGS="$SAVE_LDFLAGS"
  fi
 -AC_DEFINE_UNQUOTED(COLLECT_LIBSTATGRAB, [$collect_libstatgrab],
 -      [Wether or not to use statgrab library])
 +
  AM_CONDITIONAL(BUILD_WITH_LIBSTATGRAB, test "x$with_libstatgrab" = "xyes")
 -AM_CONDITIONAL(BUILD_WITH_LIBDEVSTAT,  test "x$with_libdevstat"  = "xyes")
 +if test "x$with_libstatgrab" = "xyes"
 +then
 +  BUILD_WITH_LIBSTATGRAB_CFLAGS="$with_libstatgrab_cflags"
 +  BUILD_WITH_LIBSTATGRAB_LDFLAGS="$with_libstatgrab_ldflags"
 +  AC_SUBST(BUILD_WITH_LIBSTATGRAB_CFLAGS)
 +  AC_SUBST(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 +fi
  
  AC_CHECK_LIB(kvm, kvm_getswapinfo, [with_libkvm="yes"], [with_libkvm="no"])
  if test "x$with_libkvm" = "xyes"
@@@ -1445,9 -1436,19 +1507,19 @@@ AC_ARG_WITH(libperl, [AS_HELP_STRING([-
        with_libperl="yes"
  ])
  
+ AC_MSG_CHECKING([for perl])
+ perl_interpreter=`which "$perl_interpreter" 2> /dev/null`
+ if test -x "$perl_interpreter"
+ then
+       AC_MSG_RESULT([yes])
+ else
+       perl_interpreter=""
+       AC_MSG_RESULT([no])
+ fi
+ 
  AC_SUBST(PERL, "$perl_interpreter")
  
- if test "x$with_libperl" = "xyes"
+ if test "x$with_libperl" = "xyes" -a -n "$perl_interpreter"
  then
    SAVE_CFLAGS=$CFLAGS
    SAVE_LDFLAGS=$LDFLAGS
@@@ -1487,7 -1488,10 +1559,10 @@@
  
    CFLAGS=$SAVE_CFLAGS
    LDFLAGS=$SAVE_LDFLAGS
- fi
+ else if test -z "$perl_interpreter"; then
+   with_libperl="no (no perl interpreter found)"
+   have_libperl="no"
+ fi; fi
  AM_CONDITIONAL(BUILD_WITH_LIBPERL, test "x$with_libperl" = "xyes")
  
  if test "x$with_libperl" = "xyes"
@@@ -1935,7 -1939,7 +2010,7 @@@ f
  if test "x$with_libxml2" = "xyes"
  then
        SAVE_CFLAGS="$CFLAGS"
 -      SAVE_LD_FLAGS="$LDFLAGS"
 +      SAVE_LDFLAGS="$LDFLAGS"
  
        CFLAGS="$CFLAGS $with_libxml2_cflags"
        LDFLAGS="$LDFLAGS $with_libxml2_ldflags"
@@@ -1980,7 -1984,7 +2055,7 @@@ f
  if test "x$with_libvirt" = "xyes"
  then
        SAVE_CFLAGS="$CFLAGS"
 -      SAVE_LD_FLAGS="$LDFLAGS"
 +      SAVE_LDFLAGS="$LDFLAGS"
  
        CFLAGS="$CFLAGS $with_libvirt_cflags"
        LDFLAGS="$LDFLAGS $with_libvirt_ldflags"
@@@ -2327,7 -2331,12 +2402,12 @@@ AC_ARG_WITH(perl-bindings, [AS_HELP_STR
  ],
  [
        PERL_BINDINGS_OPTIONS=""
-       with_perl_bindings="yes"
+       if test -n "$perl_interpreter"
+       then
+               with_perl_bindings="yes"
+       else
+               with_perl_bindings="no (no perl interpreter found)"
+       fi
  ])
  if test "x$with_perl_bindings" = "xyes"
  then