From a33ad4ebf0f5ef4094d30169b8d23bf499c8707f Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Sun, 4 May 2008 01:47:11 +0000 Subject: [PATCH] Merged revisions 115277 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r115277 | file | 2008-05-03 22:45:21 -0300 (Sat, 03 May 2008) | 10 lines Merged revisions 115276 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r115276 | file | 2008-05-03 22:43:26 -0300 (Sat, 03 May 2008) | 2 lines Treat warnings as errors when checking if a GCC attribute exists. We have to do this as GCC will just ignore the attribute and pop up a warning, it won't actually fail to compile. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115278 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- acinclude.m4 | 6 +++++- configure | 26 +++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 996ab6f701..e5f24fc57b 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 76208abc99..4df267fdc9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 114697 . +# From configure.ac Revision: 114714 . # 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,6 +16884,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; }