From: Florian Forster Date: Sat, 1 May 2010 09:00:22 +0000 (+0200) Subject: Merge branch 'collectd-4.8' into collectd-4.9 X-Git-Tag: collectd-4.10.0~3^2 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c3533f89f324411112a8b80d7ff0d7afd1e70b5d;hp=0bd574a28c06090f0c4b056f8a78e455455a6330;p=collectd.git Merge branch 'collectd-4.8' into collectd-4.9 --- diff --git a/configure.in b/configure.in index d11c5555..b663920b 100644 --- a/configure.in +++ b/configure.in @@ -481,6 +481,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( @@ -511,7 +518,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], @@ -543,6 +549,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 aab8c11e..34e860ba 100644 --- a/src/rrdcached.c +++ b/src/rrdcached.c @@ -25,6 +25,7 @@ #include "utils_rrdcreate.h" #undef HAVE_CONFIG_H +#include #include /*