ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require libcurl as a system dependency

Browse Source 
This purges libcurl from our tree and requires it to be present on the
system for building and running FreeSWITCH.

FS-353
This commit is contained in:
Travis Cross
2014-03-20 16:36:10 +00:00
parent c993962d0b
commit 1470622292
277 changed files with 34 additions and 76612 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/applications/mod_cidlookup/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_cidlookup
mod_LTLIBRARIES = mod_cidlookup.la
mod_cidlookup_la_SOURCES = mod_cidlookup.c
mod_cidlookup_la_CFLAGS = $(AM_CFLAGS)
mod_cidlookup_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_cidlookup_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_cidlookup_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_cidlookup_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_cidlookup_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
src/mod/applications/mod_curl/Makefile.am
+2 -2
View File
@@ -11,9 +11,9 @@ JSONLA=$(JSON_BUILDDIR)/libjson.la
mod_LTLIBRARIES = mod_curl.la
mod_curl_la_SOURCES = mod_curl.c
mod_curl_la_CFLAGS = $(AM_CFLAGS) -I$(JSON_DIR)
mod_curl_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_curl_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_curl_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(JSONLA)
mod_curl_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_curl_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
BUILT_SOURCES=$(JSONLA)
src/mod/applications/mod_httapi/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_httapi
mod_LTLIBRARIES = mod_httapi.la
mod_httapi_la_SOURCES = mod_httapi.c
mod_httapi_la_CFLAGS = $(AM_CFLAGS)
mod_httapi_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_httapi_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_httapi_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_httapi_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_httapi_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
src/mod/applications/mod_http_cache/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_http_cache
mod_LTLIBRARIES = mod_http_cache.la
mod_http_cache_la_SOURCES = mod_http_cache.c aws.c
mod_http_cache_la_CFLAGS = $(AM_CFLAGS)
mod_http_cache_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_http_cache_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_http_cache_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_http_cache_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_http_cache_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
src/mod/applications/mod_snom/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_snom
mod_LTLIBRARIES = mod_snom.la
mod_snom_la_SOURCES = mod_snom.c
mod_snom_la_CFLAGS = $(AM_CFLAGS)
mod_snom_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_snom_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_snom_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_snom_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_snom_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
src/mod/event_handlers/mod_format_cdr/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_format_cdr
mod_LTLIBRARIES = mod_format_cdr.la
mod_format_cdr_la_SOURCES = mod_format_cdr.c
mod_format_cdr_la_CFLAGS = $(AM_CFLAGS)
mod_format_cdr_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_format_cdr_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_format_cdr_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_format_cdr_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_format_cdr_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
src/mod/event_handlers/mod_json_cdr/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_json_cdr
mod_LTLIBRARIES = mod_json_cdr.la
mod_json_cdr_la_SOURCES = mod_json_cdr.c
mod_json_cdr_la_CFLAGS = $(AM_CFLAGS)
mod_json_cdr_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_json_cdr_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_json_cdr_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_json_cdr_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_json_cdr_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
src/mod/formats/mod_shout/Makefile.am
+2 -2
View File
@@ -20,9 +20,9 @@ MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la
mod_LTLIBRARIES = mod_shout.la
mod_shout_la_SOURCES = mod_shout.c
mod_shout_la_CFLAGS = $(AM_CFLAGS)
mod_shout_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include
mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include
mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LAMELA) $(SHOUTLA) $(MPG123LA)
mod_shout_la_LDFLAGS = -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` `cat $(SHOUTLA) | grep dependency_libs | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"`
mod_shout_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` `cat $(SHOUTLA) | grep dependency_libs | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"`
BUILT_SOURCES=$(LAMELA) $(SHOUTLA) $(MPG123LA)
src/mod/languages/mod_spidermonkey/Makefile.am
+7 -13
View File
@@ -2,10 +2,6 @@ include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_spidermonkey
CURL_DIR=$(switch_srcdir)/libs/curl
CURL_BUILDDIR=$(switch_builddir)/libs/curl
CURLLA=${switch_builddir}/libs/curl/lib/libcurl.la
JS_DIR=$(switch_srcdir)/libs/js
JS_BUILDDIR=$(switch_builddir)/libs/js
JSLA=$(JS_BUILDDIR)/libjs.la
@@ -15,19 +11,21 @@ AM_CFLAGS += -DXP_UNIX -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUP
AM_LIBADD = $(switch_builddir)/libfreeswitch.la $(JSLA) -lnspr4 $(JS_BUILDDIR)/nsprpub/pr/src/libnspr4.*
AM_LDFLAGS += -avoid-version -module -no-undefined -shared
AM_LDFLAGS += -L$(JS_BUILDDIR)/nsprpub/dist/lib
BUILT_SOURCES = $(JSLA) $(LIBCURL_DEPS)
BUILT_SOURCES = $(JSLA)
mod_LTLIBRARIES = mod_spidermonkey.la
mod_spidermonkey_la_SOURCES = mod_spidermonkey.c
mod_spidermonkey_la_CFLAGS = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS)
mod_spidermonkey_la_CFLAGS = $(AM_CFLAGS)
mod_spidermonkey_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_spidermonkey_la_LIBADD = $(AM_LIBADD)
mod_spidermonkey_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCURL)
mod_spidermonkey_la_LDFLAGS = $(CURL_LIBS) $(AM_LDFLAGS)
mod_LTLIBRARIES += mod_spidermonkey_curl.la
mod_spidermonkey_curl_la_SOURCES = mod_spidermonkey_curl.c
mod_spidermonkey_curl_la_CFLAGS = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS)
mod_spidermonkey_curl_la_CFLAGS = $(AM_CFLAGS)
mod_spidermonkey_curl_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_spidermonkey_curl_la_LIBADD = $(AM_LIBADD)
mod_spidermonkey_curl_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCURL)
mod_spidermonkey_curl_la_LDFLAGS = $(CURL_LIBS) $(AM_LDFLAGS)
mod_LTLIBRARIES += mod_spidermonkey_socket.la
mod_spidermonkey_socket_la_SOURCES = mod_spidermonkey_socket.c
@@ -61,10 +59,6 @@ $(JSLA): $(JS_DIR) $(JS_DIR)/.update
cd $(JS_BUILDDIR)/nsprpub && $(MAKE) -j1 && cd $(JS_BUILDDIR) && $(MAKE)
$(TOUCH_TARGET)
$(CURLLA):
@cd $(CURL_BUILDDIR) && $(MAKE)
$(TOUCH_TARGET)
install-exec-local: $(DESTDIR)$(libdir)/libjs.la
$(DESTDIR)$(libdir)/libjs.la: $(JSLA)
src/mod/languages/mod_v8/Makefile.am
+4 -12
View File
@@ -45,10 +45,6 @@ endif
CXX_TARGET_PLATFORM := $(shell $(CXX) -v 2>&1 | grep Target | cut '-d:' -f2 | cut '-d-' -f1 | tr -d ' ')
CXX_TARGET_PLATFORM_I386 := $(shell echo "$(CXX_TARGET_PLATFORM)" | sed 's/^\(.\{1\}\)\(.\{1\}\)/\13/')
CURL_DIR=$(switch_srcdir)/libs/curl
CURL_BUILDDIR=$(switch_builddir)/libs/curl
CURLLA=${switch_builddir}/libs/curl/lib/libcurl.la
MODNAME=mod_v8
AM_CFLAGS += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include
@@ -63,7 +59,7 @@ AM_LIBADD = $(switch_builddir)/libfreeswitch.la -lv8 #-licuuc -licui18n
AM_LDFLAGS += -L$(V8_LIBDIR)
endif
BUILT_SOURCES = $(V8LIB) $(LIBCURL_DEPS)
BUILT_SOURCES = $(V8LIB)
if HAVE_ODBC
AM_CFLAGS += -DHAVE_ODBC $(ODBC_INC_FLAGS)
@@ -93,10 +89,10 @@ mod_v8_la_SOURCES = \
src/fsfile.cpp \
src/fseventhandler.cpp
mod_v8_la_CFLAGS = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS) -I$(switch_srcdir)/libs/libteletone/src
mod_v8_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS) -I$(switch_srcdir)/libs/libteletone/src
mod_v8_la_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/libteletone/src
mod_v8_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -I$(switch_srcdir)/libs/libteletone/src
mod_v8_la_LIBADD = $(AM_LIBADD)
mod_v8_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCURL) $(V8_LDFLAGS)
mod_v8_la_LDFLAGS = $(CURL_LIBS) $(AM_LDFLAGS) $(V8_LDFLAGS)
#mod_LTLIBRARIES += mod_v8_skel.la
#mod_v8_skel_la_SOURCES = mod_v8_skel.cpp
@@ -132,10 +128,6 @@ $(V8LIB): $(V8_DIR)
OUTDIR=$(V8_BUILDDIR)/out \
PYTHONPATH="$(V8_DIR)/build/gyp/pylib:$(PYTHONPATH)" $(MAKE) -C $(V8_DIR) $(V8_BUILDPARAMS) native
$(CURLLA):
@cd $(CURL_BUILDDIR) && $(MAKE)
$(TOUCH_TARGET)
if ENABLE_STATIC_V8
install-exec-local: $(V8LIB)
else
src/mod/xml_int/mod_xml_curl/Makefile.am
+2 -2
View File
@@ -4,6 +4,6 @@ MODNAME=mod_xml_curl
mod_LTLIBRARIES = mod_xml_curl.la
mod_xml_curl_la_SOURCES = mod_xml_curl.c
mod_xml_curl_la_CFLAGS = $(AM_CFLAGS)
mod_xml_curl_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_xml_curl_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_xml_curl_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_xml_curl_la_LDFLAGS = -avoid-version -module -no-undefined -shared
mod_xml_curl_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared