picked the wrong day to stop sniffing glue...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15745 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index 7d0c775287bded30d5d85304bb9f72ca6e2de072..8a1366fdd154edac2e0cc2d025b2195f9a67cd77 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTS = foreign
 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)

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index e43cd8eb078db8780ff75c28a32ee523acb41405..c6399996bf8798e30a63331fb776ecae65c42761 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -45,7 +45,7 @@ CFLAGS=@CFLAGS@
 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

diff --git a/configure.in b/configure.in
index e25a259269587f1f7d3d57e5a69a9d0f8c359b93..7a48c9656e5d69ac71980cf01f33fed0ca88b3f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -264,7 +264,7 @@ if test "${enable_debug}" = "yes"; then
        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 @@ esac
 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)

diff --git a/src/mod/asr_tts/mod_unimrcp/Makefile.am b/src/mod/asr_tts/mod_unimrcp/Makefile.am
index d024bf50075ffc0cd5ae21929c384e665e725085..cd5ead0324d9c49079b8fda4ba13ddbf9aa07585 100644 (file)
--- a/src/mod/asr_tts/mod_unimrcp/Makefile.am
+++ b/src/mod/asr_tts/mod_unimrcp/Makefile.am
@@ -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

diff --git a/src/mod/endpoints/mod_sofia/Makefile.am b/src/mod/endpoints/mod_sofia/Makefile.am
index 2c94c9d4ebad67d2a727a91563857299c3376739..2e52e0d64de4e5d35343c12e6a55132e19c33fc7 100644 (file)
--- a/src/mod/endpoints/mod_sofia/Makefile.am
+++ b/src/mod/endpoints/mod_sofia/Makefile.am
@@ -18,7 +18,7 @@ SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la
 
 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