From e2ff55122d36c1190599be67d8e0ffb306c231bd Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 15 Jul 2010 18:44:20 +0000 Subject: Fix linking asterisk on CentOS 5, which is using gcc 4.1.1. Gcc 4.1.2 has the real fix. Review: https://reviewboard.asterisk.org/r/790/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276731 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- autoconf/ast_gcc_attribute.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'autoconf/ast_gcc_attribute.m4') diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4 index d3f05be5b..f291dbbd6 100644 --- a/autoconf/ast_gcc_attribute.m4 +++ b/autoconf/ast_gcc_attribute.m4 @@ -1,11 +1,12 @@ # Helper function to check for gcc attributes. -# AST_GCC_ATTRIBUTE([attribute name], [attribute syntax], [attribute scope]) +# AST_GCC_ATTRIBUTE([attribute name], [attribute syntax], [attribute scope], [makeopts flag]) AC_DEFUN([AST_GCC_ATTRIBUTE], [ AC_MSG_CHECKING(for compiler 'attribute $1' support) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" +m4_ifval([$4],$4=0) if test "x$2" = "x" then @@ -13,6 +14,7 @@ AC_COMPILE_IFELSE( AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}], []), AC_MSG_RESULT(yes) + m4_ifval([$4],$4=1) AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]), AC_MSG_RESULT(no) ) @@ -21,11 +23,13 @@ AC_COMPILE_IFELSE( AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}], []), AC_MSG_RESULT(yes) + m4_ifval([$4],$4=1) AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]), AC_MSG_RESULT(no) ) fi +m4_ifval([$4],AC_SUBST($4)) CFLAGS="$saved_CFLAGS" ] ) -- cgit v1.2.3