retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-353: add testing hack to use system xmlrpc-c

This commit is contained in:
Michael Jerris 2014-03-17 14:33:48 -04:00
parent b324e2633a
commit 714e3133e7
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -404,6 +404,19 @@ AC_ARG_ENABLE(cpp,
AM_CONDITIONAL([ENABLE_CPP],[test "${enable_cpp}" = "yes"])
AC_ARG_ENABLE([system-xmlrpc-c],
[AS_HELP_STRING([--enable-system-xmlrpc-c],
[use system lib for xmlrpc-c])],,
[enable_xmlrpcc="no"])
if test "${enable_xmlrpcc}" = "yes" ; then
SYS_XMLRPC_CFLAGS=`xmlrpc-c-config --cflags`
SYS_XMLRPC_LDFLAGS=`xmlrpc-c-config --libs`
fi
AC_SUBST(SYS_XMLRPC_CFLAGS)
AC_SUBST(SYS_XMLRPC_LDFLAGS)
AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
AC_ARG_ENABLE(srtp,
[AC_HELP_STRING([--disable-srtp],[build without srtp support])],[enable_srtp="$enableval"],[enable_srtp="yes"])

23
src/mod/xml_int/mod_xml_rpc/Makefile.am
View File

@ -1,17 +1,20 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_xml_rpc
MAKEFLAGS=-j1
XMLRPC_DIR=$(switch_srcdir)/libs/xmlrpc-c
mod_LTLIBRARIES = mod_xml_rpc.la
mod_xml_rpc_la_SOURCES = mod_xml_rpc.c
mod_xml_rpc_la_CFLAGS = $(AM_CFLAGS) -I. -w -I$(XMLRPC_DIR)/lib/expat/xmlparse
mod_xml_rpc_la_CFLAGS += -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include
mod_xml_rpc_la_CFLAGS += -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__ -D_GNU_SOURCE
mod_xml_rpc_la_SOURCES = mod_xml_rpc.c ws.c
mod_xml_rpc_la_CFLAGS = $(AM_CFLAGS) -I. -w
mod_xml_rpc_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_xml_rpc_la_LDFLAGS = -avoid-version -module -no-undefined -shared
if SYSTEM_XMLRPCC
mod_xml_rpc_la_CFLAGS+=$(SYS_XMLRPC_CFLAGS)
mod_xml_rpc_la_LDFLAGS+=$(SYS_XMLRPC_LDFLAGS)
else
MAKEFLAGS=-j1
XMLRPC_DIR=$(switch_srcdir)/libs/xmlrpc-c
mod_xml_rpc_la_CFLAGS += -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include
mod_xml_rpc_la_CFLAGS += -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__ -D_GNU_SOURCE
mod_xml_rpc_la_SOURCES += ../../../../libs/xmlrpc-c/src/version.c\
../../../../libs/xmlrpc-c/lib/libutil/asprintf.c\
../../../../libs/xmlrpc-c/lib/util/casprintf.c\
@ -71,8 +74,7 @@ mod_xml_rpc_la_SOURCES += ../../../../libs/xmlrpc-c/src/version.c\
../../../../libs/xmlrpc-c/src/xmlrpc_server_cgi.c\
../../../../libs/xmlrpc-c/src/xmlrpc_string.c\
../../../../libs/xmlrpc-c/src/xmlrpc_struct.c\
../../../../libs/xmlrpc-c/lib/expat/xmltok/xmltok.c\
ws.c
../../../../libs/xmlrpc-c/lib/expat/xmltok/xmltok.c
BUILT_SOURCES=$(XMLRPC_DIR)/version.h $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h
$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o: $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h
@ -90,7 +92,6 @@ $(XMLRPC_DIR)/version.h:
clean:
cd $(XMLRPC_DIR) && $(MAKE) clean
endif