Author: lukedashjr Date: Mon Apr 21 23:18:15 2008 New Revision: 8165 Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/asr_tts/mod_openmrcp/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_iax/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/Makefile Log: iax, openmrcp, portaudio Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in Mon Apr 21 23:18:15 2008 @@ -186,11 +186,18 @@ # TODO: replace howl dep (mod_zeroconf) -PKG_CHECK_MODULES([iaxclient],[iaxclient],[ -AC_SUBST(iaxclient_CFLAGS) -AC_SUBST(iaxclient_LIBS) +AC_CHECK_LIB([iax], [iax_mutex_lock], [ +PKG_CHECK_MODULES([libiax],[iaxclient],[ ],[ -AC_MSG_WARN([iaxclient not found: mod_iax will not work.]) +libiax_CFLAGS=-I/usr/include/iax +libiax_LIBS='-liax -lpthread' +]) +AC_SUBST(libiax_CFLAGS) +AC_SUBST(libiax_LIBS) +],[ +AC_MSG_WARN([a threadsafe libiax was not found: mod_iax will not work.]) +],[ +-lpthread ]) PKG_CHECK_MODULES([iksemel],[iksemel],[ @@ -222,11 +229,23 @@ # TODO: openldap (mod_ldap) +PKG_CHECK_MODULES([openmrcpclient],[openmrcpclient],[ +AC_SUBST(openmrcpclient_CFLAGS) +AC_SUBST(openmrcpclient_LIBS) +],[ +AC_MSG_WARN([openmrcpclient not found: mod_openmrcp will not work.]) +]) + PKG_CHECK_MODULES([pcre],[libpcre]) SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $pcre_CFLAGS" SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $pcre_LIBS" # TODO: portaudio (mod_portaudio) +# TODO: make this automatic or something +portaudio_CFLAGS=-I/usr/include/portaudio +portaudio_LIBS=-lportaudio +AC_SUBST(portaudio_CFLAGS) +AC_SUBST(portaudio_LIBS) # TODO: resample (optional; see far above) Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/asr_tts/mod_openmrcp/Makefile Mon Apr 21 23:18:15 2008 @@ -1,43 +1,12 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# TODO -# - needs to compile/link against the _freeswitch_ sofia libs (see FIXME) - -OPENMRCP_DIR=../../../../libs/openmrcp - -OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/libopenmrcpclient/include/ -I$(OPENMRCP_DIR)/aprtoolkit/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ - -OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/libopenmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a $(OPENMRCP_DIR)/aprtoolkit/.libs/libaprtoolkit.a - -MRCP_APR_INCLUDES = -I../../../../libs/apr/include -MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include - #do not specify gcc specific compiler flags #LOCAL_CFLAGS= -Wno-unused -Wno-comment -Wno-sign-compare -LOCAL_CFLAGS= $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) +LOCAL_CFLAGS=$(openmrcpclient_CFLAGS) $(SOFIA_CFLAGS) -LOCAL_LIBADD=$(OPENMRCP_LIBS) +LOCAL_LDFLAGS=$(openmrcpclient_LIBS) $(SOFIA_LIBS) LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework CoreFoundation -framework SystemConfiguration -lssl -lcrypto" ; fi ; -SOFIA_DIR=../../../../libs/sofia-sip -SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua -SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la - include ../../../../build/modmake.rules - -$(OPENMRCP_DIR)/Makefile: $(OPENMRCP_DIR)/.update - cd $(OPENMRCP_DIR) && ./bootstrap && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip - $(TOUCH_TARGET) - -$(OPENMRCP_LIBS): $(SOFIALA) $(OPENMRCP_DIR)/Makefile - cd $(OPENMRCP_DIR) && $(MAKE) - $(TOUCH_TARGET) - -$(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update - cd $(SOFIA_DIR) && $(MAKE) - $(TOUCH_TARGET) - -../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) - Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_iax/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_iax/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_iax/Makefile Mon Apr 21 23:18:15 2008 @@ -1,3 +1,3 @@ -LOCAL_CFLAGS=$(iaxclient_CFLAGS) -LOCAL_LDFLAGS=$(iaxclient_LIBS) +LOCAL_CFLAGS=$(libiax_CFLAGS) +LOCAL_LDFLAGS=$(libiax_LIBS) include $(BASE)/build/modmake.rules Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/Makefile Mon Apr 21 23:18:15 2008 @@ -1,20 +1,10 @@ -BASE=../../../.. - -PA_DIR=$(BASE)/libs/portaudio - -PALA=$(PA_DIR)/lib/libportaudio.la -LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -D__EXTENSION__=1 +LOCAL_CFLAGS=-I. -D__EXTENSION__=1 +LOCAL_CFLAGS+=$(portaudio_CFLAGS) +LOCAL_LDFLAGS+=$(portaudio_LIBS) LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" ; fi ; -LOCAL_LIBADD=$(PALA) LOCAL_OBJS=pablio.o pa_ringbuffer.o LOCAL_SOURCES=pablio.c pa_ringbuffer.c include $(BASE)/build/modmake.rules - -$(PALA): $(PA_DIR) $(PA_DIR)/.update - cd $(PA_DIR) && $(MAKE) - $(TOUCH_TARGET) - -$(LOCAL_OBJS): $(LOCAL_SOURCES)