X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=c43502764efed26ecc786225b47cb448c0de7543;hb=96382507c3296a35399f6b3c258ae2a47761bf06;hp=804cdfc36ec9259e02d7f7d1ba5a35337a61d7ab;hpb=85ecbfb74749989208001dfead119e5cb641fa6b;p=collectd.git

diff --git a/configure.in b/configure.in
index 804cdfc3..c4350276 100644
--- 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"