mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-24 05:02:10 +00:00
add detection of system libcurl, and if it is available use that instead of in tree curl build. Implemented just in mod_shout so far
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4592 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -46,6 +46,7 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/build/config/ac_gcc_archflag.m4 \
|
||||
$(top_srcdir)/build/config/ac_gcc_x86_cpuid.m4 \
|
||||
$(top_srcdir)/libs/apr/build/apr_common.m4 \
|
||||
$(top_srcdir)/libs/curl/docs/libcurl/libcurl.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
@@ -100,6 +101,9 @@ ISLINUX_TRUE = @ISLINUX_TRUE@
|
||||
ISMAC_FALSE = @ISMAC_FALSE@
|
||||
ISMAC_TRUE = @ISMAC_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBCURL = @LIBCURL@
|
||||
LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
|
||||
LIBCURL_DEPS = @LIBCURL_DEPS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
@@ -129,6 +133,7 @@ WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@
|
||||
WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@
|
||||
WGET = @WGET@
|
||||
ZCAT = @ZCAT@
|
||||
_libcurl_config = @_libcurl_config@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
BASE=../../../..
|
||||
MODNAME=mod_shout
|
||||
LAME=lame-3.97
|
||||
SHOUT=libshout-2.2.2
|
||||
switch_srcdir=../../../..
|
||||
|
||||
WANT_CURL=yes
|
||||
|
||||
LAME_DIR=$(switch_srcdir)/libs/$(LAME)
|
||||
SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT)
|
||||
CURL_DIR=$(switch_srcdir)/libs/curl
|
||||
|
||||
LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la
|
||||
SHOUTLA=$(SHOUT_DIR)/src/libshout.la
|
||||
CURLLA=$(CURL_DIR)/lib/libcurl.la
|
||||
|
||||
LOCAL_CFLAGS=-I$(CURL_DIR)/include -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include
|
||||
LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) -lcurl
|
||||
LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include
|
||||
LOCAL_LIBADD=$(LAMELA) $(SHOUTLA)
|
||||
|
||||
MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o
|
||||
LOCAL_OBJS=$(MP3OBJS)
|
||||
@@ -36,9 +35,6 @@ $(SHOUT_DIR)/Makefile:
|
||||
$(SHOUTLA): $(SHOUT_DIR)/Makefile
|
||||
cd $(SHOUT_DIR) && $(MAKE)
|
||||
|
||||
$(CURLLA):
|
||||
cd $(CURL_DIR) && $(MAKE)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user