picked the wrong day to stop sniffing glue...
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15745 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
a9ef56611a
commit
02c7a3acc9
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue