Merge branch 'collectd-4.8'

diff --combined src/Makefile.am
index d0cd99d,0ed299b..15609e4
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -173,14 -173,6 +173,14 @@@ collectd_LDADD += "-dlopen" conntrack.l
  collectd_DEPENDENCIES += conntrack.la
  endif
  
 +if BUILD_PLUGIN_CONTEXTSWITCH
 +pkglib_LTLIBRARIES += contextswitch.la
 +contextswitch_la_SOURCES = contextswitch.c
 +contextswitch_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" contextswitch.la
 +collectd_DEPENDENCIES += contextswitch.la
 +endif
 +
  if BUILD_PLUGIN_CPU
  pkglib_LTLIBRARIES += cpu.la
  cpu_la_SOURCES = cpu.c
@@@ -478,14 -470,6 +478,14 @@@ collectd_LDADD += "-dlopen" match_empty
  collectd_DEPENDENCIES += match_empty_counter.la
  endif
  
 +if BUILD_PLUGIN_MATCH_HASHED
 +pkglib_LTLIBRARIES += match_hashed.la
 +match_hashed_la_SOURCES = match_hashed.c
 +match_hashed_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" match_hashed.la
 +collectd_DEPENDENCIES += match_hashed.la
 +endif
 +
  if BUILD_PLUGIN_MATCH_REGEX
  pkglib_LTLIBRARIES += match_regex.la
  match_regex_la_SOURCES = match_regex.c
@@@ -586,16 -570,6 +586,16 @@@ endi
  collectd_DEPENDENCIES += mysql.la
  endif
  
 +if BUILD_PLUGIN_NETAPP
 +pkglib_LTLIBRARIES += netapp.la
 +netapp_la_SOURCES = netapp.c
 +netapp_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBNETAPP_CPPFLAGS)
 +netapp_la_LDFLAGS = -module -avoid-version $(LIBNETAPP_LDFLAGS)
 +netapp_la_LIBADD = $(LIBNETAPP_LIBS)
 +collectd_LDADD += "-dlopen" netapp.la
 +collectd_DEPENDENCIES += netapp.la
 +endif
 +
  if BUILD_PLUGIN_NETLINK
  pkglib_LTLIBRARIES += netlink.la
  netlink_la_SOURCES = netlink.c
@@@ -937,14 -911,6 +937,14 @@@ collectd_LDADD += "-dlopen" target_repl
  collectd_DEPENDENCIES += target_replace.la
  endif
  
 +if BUILD_PLUGIN_TARGET_SCALE
 +pkglib_LTLIBRARIES += target_scale.la
 +target_scale_la_SOURCES = target_scale.c
 +target_scale_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" target_scale.la
 +collectd_DEPENDENCIES += target_scale.la
 +endif
 +
  if BUILD_PLUGIN_TARGET_SET
  pkglib_LTLIBRARIES += target_set.la
  target_set_la_SOURCES = target_set.c
@@@ -1145,7 -1111,7 +1145,7 @@@ EXTRA_DIST +=   collectd.conf.pod 
  
  .pod.1:
        pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
-               >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
+               >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
        @if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
        then \
                echo "$@ has some POD errors!"; false; \
@@@ -1153,7 -1119,7 +1153,7 @@@
  
  .pod.5:
        pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
-               >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
+               >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
        @if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
        then \
                echo "$@ has some POD errors!"; false; \

diff --combined src/rrdcached.c
index bca10be,191df58..aab8c11
--- 1/src/rrdcached.c
--- 2/src/rrdcached.c
+++ b/src/rrdcached.c
@@@ -24,6 -24,7 +24,7 @@@
  #include "common.h"
  #include "utils_rrdcreate.h"
  
+ #undef HAVE_CONFIG_H
  #include <rrd_client.h>
  
  /*
@@@ -192,14 -193,18 +193,14 @@@ static int rc_config (const char *key, 
    }
    else if (strcasecmp ("CreateFiles", key) == 0)
    {
 -    if ((strcasecmp ("false", value) == 0)
 -        || (strcasecmp ("no", value) == 0)
 -        || (strcasecmp ("off", value) == 0))
 +    if (IS_FALSE (value))
        config_create_files = 0;
      else
        config_create_files = 1;
    }
    else if (strcasecmp ("CollectStatistics", key) == 0)
    {
 -    if ((strcasecmp ("false", value) == 0)
 -        || (strcasecmp ("no", value) == 0)
 -        || (strcasecmp ("off", value) == 0))
 +    if (IS_FALSE (value))
        config_collect_stats = 0;
      else
        config_collect_stats = 1;