diff --git a/build/configure.ac.system b/build/configure.ac.system
index 4544a54..d71d2d0 100644
--- a/build/configure.ac.system
+++ b/build/configure.ac.system
@@ -81,7 +81,7 @@ AC_CHECK_FUNC(mkdir,
 	      [AC_MSG_CHECKING([mkdir variant])
 	      mkdir_variant="unknown"
 	      save_CFLAGS="$CFLAGS"
-	      CFLAGS="-Werror -Wall $CFLAGS" # non-gcc compilers?
+	      CFLAGS=$WARN_CFLAGS
 	      AC_TRY_COMPILE([
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/configure.ac b/configure.ac
index 229eb6a..48b61b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@ dnl The order of the includes here is rather important
 dnl
 m4_include(build/configure.ac.version)	dnl macros setting up various version declares
 m4_include(build/configure.ac.tools)	dnl checks for tools we use
-m4_include(build/configure.ac.system)	dnl checks for system functions, headers, libs
 m4_include(build/configure.ac.features)	dnl macros for backend/feature handling
 m4_include(build/configure.ac.warnings)	dnl checks for compiler warning
+m4_include(build/configure.ac.system)	dnl checks for system functions, headers, libs
 m4_include(build/configure.ac.analysis)	dnl checks for analysis tools (lcov, etc)
 m4_include(build/configure.ac.noversion) dnl disable builtin libtool versioning
 AC_CACHE_SAVE