Diff
Modified: freeswitch/trunk/Makefile.am (15744 => 15745)
--- freeswitch/trunk/Makefile.am 2009-12-01 22:09:04 UTC (rev 15744)
+++ freeswitch/trunk/Makefile.am 2009-12-01 22:19:07 UTC (rev 15745)
@@ -4,7 +4,7 @@
NAME=freeswitch
PREFIX=$(prefix)
-AM_CFLAGS = $(SWITCH_AM_CFLAGS)
+AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
BASE = $(switch_srcdir)
Modified: freeswitch/trunk/build/modmake.rules.in (15744 => 15745)
--- freeswitch/trunk/build/modmake.rules.in 2009-12-01 22:09:04 UTC (rev 15744)
+++ freeswitch/trunk/build/modmake.rules.in 2009-12-01 22:19:07 UTC (rev 15745)
@@ -45,7 +45,7 @@
CXXFLAGS=@CXXFLAGS@
LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS)
-ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
+ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ @SWITCH_ANSI_CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) --prefix=$(PREFIX) --disable-shared --with-pic
Modified: freeswitch/trunk/configure.in (15744 => 15745)
--- freeswitch/trunk/configure.in 2009-12-01 22:09:04 UTC (rev 15744)
+++ freeswitch/trunk/configure.in 2009-12-01 22:19:07 UTC (rev 15745)
@@ -264,7 +264,7 @@
saved_CFLAGS=$CFLAGS
CFLAGS=
AX_CFLAGS_WARN_ALL_ANSI
- APR_ADDTO(SWITCH_AM_CFLAGS, $CFLAGS)
+ SWITCH_ANSI_CFLAGS=$CFLAGS
CFLAGS=$saved_CFLAGS
if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
@@ -326,6 +326,7 @@
APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)
AC_SUBST(SWITCH_AM_CFLAGS)
+AC_SUBST(SWITCH_ANSI_CFLAGS)
AC_SUBST(SWITCH_AM_CXXFLAGS)
AC_SUBST(SWITCH_AM_LDFLAGS)
AC_SUBST(ESL_LDFLAGS)
Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am (15744 => 15745)
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am 2009-12-01 22:09:04 UTC (rev 15744)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am 2009-12-01 22:19:07 UTC (rev 15745)
@@ -1,6 +1,6 @@
MODNAME=mod_unimrcp
-AM_CFLAGS = $(SWITCH_AM_CFLAGS)
+AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
#AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
#we should set all these vars from configure, no reason to have these in each Makefile.am
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (15744 => 15745)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am 2009-12-01 22:09:04 UTC (rev 15744)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am 2009-12-01 22:19:07 UTC (rev 15745)
@@ -18,7 +18,7 @@
mod_LTLIBRARIES = mod_sofia.la
mod_sofia_la_SOURCES = mod_sofia.c sofia.c sofia_glue.c sofia_presence.c sofia_reg.c sofia_sla.c mod_sofia.h
-mod_sofia_la_CFLAGS = $(AM_CFLAGS)
+mod_sofia_la_CFLAGS = $(AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
mod_sofia_la_CFLAGS += -I. -I$(SOFIAUA_DIR)/bnf -I$(SOFIAUA_DIR)/features
mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/http -I$(SOFIAUA_DIR)/ipt
mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/iptsec -I$(SOFIAUA_DIR)/msg