ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-21 18:54:14 +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 committed 2014-03-20 21:15:29 +00:00
1 parent c993962d0b
commit 1470622292
277 files changed
+34 -76612
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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