[asterisk-commits] twilson: branch twilson/config_work r366662 - /team/twilson/config_work/

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed May 16 11:33:28 2012
New Revision: 366662

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=366662
Log:
Try to get -Wtrampolines stuff right again

Modified:
    team/twilson/config_work/Makefile
    team/twilson/config_work/configure
    team/twilson/config_work/configure.ac
    team/twilson/config_work/makeopts.in

Modified: team/twilson/config_work/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/Makefile?view=diff&rev=366662&r1=366661&r2=366662
==============================================================================
--- team/twilson/config_work/Makefile (original)
+++ team/twilson/config_work/Makefile Wed May 16 11:33:28 2012
@@ -194,6 +194,7 @@
   _ASTCFLAGS+=-Wunused
   _ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
   _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+  _ASTCFLAGS+=$(AST_TRAMPOLINES)
   _ASTCFLAGS+=-Wundef
   _ASTCFLAGS+=-Wmissing-format-attribute
   _ASTCFLAGS+=-Wformat=2

Modified: team/twilson/config_work/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/configure.ac?view=diff&rev=366662&r1=366661&r2=366662
==============================================================================
--- team/twilson/config_work/configure.ac (original)
+++ team/twilson/config_work/configure.ac Wed May 16 11:33:28 2012
@@ -983,12 +983,12 @@
 AC_MSG_CHECKING(for -Wtrampolines support)
 if $(${CC} -Wtrampolines -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
 	AC_MSG_RESULT(yes)
-	AST_DECLARATION_AFTER_STATEMENT=-Wtrampolines
+	AST_TRAMPOLINES=-Wtrampolines
 else
 	AC_MSG_RESULT(no)
-	AST_DECLARATION_AFTER_STATEMENT=
-fi
-AC_SUBST(AST_DECLARATION_AFTER_STATEMENT)
+	AST_TRAMPOLINES=
+fi
+AC_SUBST(AST_TRAMPOLINES)
 
 AC_MSG_CHECKING(for _FORTIFY_SOURCE support)
 if $(${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then

Modified: team/twilson/config_work/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/makeopts.in?view=diff&rev=366662&r1=366661&r2=366662
==============================================================================
--- team/twilson/config_work/makeopts.in (original)
+++ team/twilson/config_work/makeopts.in Wed May 16 11:33:28 2012
@@ -101,6 +101,7 @@
 AST_ASTERISKSSL=@AST_ASTERISKSSL@
 
 AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@
+AST_TRAMPOLINES=@AST_TRAMPOLINES@
 AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
 AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
 AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@