Merge branch 'collectd-4.9'

diff --git a/configure.in b/configure.in
index 804cdfc..c435027 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -484,6 +484,13 @@ AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr
 
 AC_FUNC_STRERROR_R
 
+SAVE_CFLAGS="$CFLAGS"
+# Emulate behavior of src/Makefile.am
+if test "x$GCC" = "xyes"
+then
+       CFLAGS="$CFLAGS -Wall -Werror"
+fi
+
 AC_CACHE_CHECK([for strtok_r],
   [c_cv_have_strtok_r_default],
   AC_LINK_IFELSE(
@@ -514,7 +521,6 @@ AC_CACHE_CHECK([for strtok_r],
 
 if test "x$c_cv_have_strtok_r_default" = "xno"
 then
-  SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -D_REENTRANT=1"
 
   AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
@@ -546,6 +552,12 @@ then
   )
 fi
 
+CFLAGS="$SAVE_CFLAGS"
+if test "x$c_cv_have_strtok_r_reentrant" = "xyes"
+then
+       CFLAGS="$CFLAGS -D_REENTRANT=1"
+fi
+
 AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
 
 socket_needs_socket="no"

diff --git a/src/rrdcached.c b/src/rrdcached.c
index aab8c11..34e860b 100644 (file)
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -25,6 +25,7 @@
 #include "utils_rrdcreate.h"
 
 #undef HAVE_CONFIG_H
+#include <rrd.h>
 #include <rrd_client.h>
 
 /*