diff --git a/acinclude.m4 b/acinclude.m4
index 31688e3411..b4df57451c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3,13 +3,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"
+)
 
 # AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
 
diff --git a/configure b/configure
index 427b3f7d67..c9479e0ce7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 114695 .
+# From configure.ac Revision: 115257 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -14892,6 +14892,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
@@ -14941,9 +14943,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
@@ -14993,9 +14999,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
@@ -15045,9 +15055,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
@@ -15097,9 +15111,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
@@ -15149,9 +15167,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
@@ -15201,6 +15223,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; }