diff --git a/acinclude.m4 b/acinclude.m4
index 996ab6f7014d3ba1a6e5a7a4fec7085ae1912be2..e5f24fc57b8979634367a4726f01a74bac92032d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -7,13 +7,17 @@
 AC_DEFUN([AST_GCC_ATTRIBUTE],
 [
 AC_MSG_CHECKING(for compiler 'attribute $1' support)
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 AC_COMPILE_IFELSE(
 	AC_LANG_PROGRAM([static int __attribute__(($1)) test(void) {}],
 			[]),
 	AC_MSG_RESULT(yes)
 	AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
 	AC_MSG_RESULT(no))
-])
+]
+CFLAGS="$saved_CFLAGS"
+)
 
 # Helper function to setup variables for a package.
 # $1 -> the package name. Used in configure.ac and also as a prefix
diff --git a/configure b/configure
index b0dcbe66d1f58953b98d1bd73befa3e1cac7b8a3..e5828b704a06227a10e48acb29fef59f95e1febc 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 115078 .
+# From configure.ac Revision: 115159 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -16553,6 +16553,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute pure' support" >&5
 echo $ECHO_N "checking for compiler 'attribute pure' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16602,9 +16604,13 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute malloc' support" >&5
 echo $ECHO_N "checking for compiler 'attribute malloc' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16654,9 +16660,13 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute const' support" >&5
 echo $ECHO_N "checking for compiler 'attribute const' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16706,9 +16716,13 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute unused' support" >&5
 echo $ECHO_N "checking for compiler 'attribute unused' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16758,9 +16772,13 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute always_inline' support" >&5
 echo $ECHO_N "checking for compiler 'attribute always_inline' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16810,9 +16828,13 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute deprecated' support" >&5
 echo $ECHO_N "checking for compiler 'attribute deprecated' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16862,9 +16884,13 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for compiler 'attribute sentinel' support" >&5
 echo $ECHO_N "checking for compiler 'attribute sentinel' support... $ECHO_C" >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16914,6 +16940,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+CFLAGS="$saved_CFLAGS"
+
 
 { echo "$as_me:$LINENO: checking for -ffunction-sections support" >&5
 echo $ECHO_N "checking for -ffunction-sections support... $ECHO_C" >&6; }