Author: lukedashjr Date: Mon Apr 21 17:08:58 2008 New Revision: 8143 Added: freeswitch/branches/lukedashjr/syslibs/freeswitch/build/config/apr_common.m4 - copied unchanged from r8099, /freeswitch/trunk/libs/apr/build/apr_common.m4 freeswitch/branches/lukedashjr/syslibs/freeswitch/src/hash.h - copied unchanged from r8099, /freeswitch/trunk/libs/sqlite/src/hash.h freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/token.h - copied unchanged from r8099, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/token.h freeswitch/branches/lukedashjr/syslibs/freeswitch/src/srtp.h - copied unchanged from r8099, /freeswitch/trunk/libs/srtp/include/srtp.h Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am freeswitch/branches/lukedashjr/syslibs/freeswitch/acinclude.m4 freeswitch/branches/lukedashjr/syslibs/freeswitch/bootstrap.sh freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_platform.h freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/mod_enum.c freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_ilbc/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_speex/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_voipcodecs/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_iax/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/Makefile.am freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/sm.mak freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/Makefile freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_hash.c freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_state_machine.c freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c Log: FreeSwitch using system libs Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am Mon Apr 21 17:08:58 2008 @@ -26,6 +26,8 @@ cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\ fi +.EXPORT_ALL_VARIABLES: + sounds: sounds-en-us-callie-8000 sounds-install: sounds-en-us-callie-8000-install moh: sounds-music-8000 @@ -86,13 +88,9 @@ src/switch_xml.cpp\ src/switch_config.c\ src/switch_time.c\ -libs/stfu/stfu.c\ src/switch_cpp.cpp\ src/g711.c\ -src/switch_pcm.c\ -libs/libteletone/src/libteletone_detect.c\ -libs/libteletone/src/libteletone_generate.c - +src/switch_pcm.c library_includedir = $(PREFIX)/include @@ -125,24 +123,8 @@ src/include/switch_log.h\ src/include/switch_xml.h\ src/include/switch_cpp.h\ -libs/libteletone/src/libteletone_detect.h\ -libs/libteletone/src/libteletone_generate.h\ -libs/libteletone/src/libteletone.h\ src/include/switch_odbc.h -CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` -CORE_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` -CORE_CFLAGS += -I$(switch_srcdir)/libs/stfu -CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite -CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre -CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include -CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -CORE_CFLAGS += $(RESAMPLE_CFLAGS) - -CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la -CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la -CORE_LIBS += libs/srtp/libsrtp.la $(RESAMPLE_LIB) - lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) @@ -159,31 +141,16 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) -freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) -freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la -if ADD_LIBEDIT -freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT -freeswitch_LDADD += libs/libedit/src/.libs/libedit.a -endif - - -if ADD_LIBEDIT -CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT -CORE_LIBS += libs/libedit/src/.libs/libedit.a -endif +freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) /usr/lib/stfu.o +freeswitch_LDADD = libfreeswitch.la if ADD_ODBC -CORE_CFLAGS += -DSWITCH_HAVE_ODBC libfreeswitch_la_SOURCES += src/switch_odbc.c -libfreeswitch_la_LDFLAGS += -Wl,-lodbc endif bin_SCRIPTS = scripts/gentls_cert scripts/fsxs -libs/libedit/src/.libs/libedit.a: - cd libs/libedit && $(MAKE) - $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool modules.conf $(switch_builddir)/quiet_libtool: $(switch_builddir)/libtool @@ -258,32 +225,6 @@ yesdepends: rm .nodepends -libs/apr/libapr-1.la: libs/apr libs/apr/.update - @cd libs/apr && $(MAKE) - @$(TOUCH_TARGET) - -libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/libapr-1.la - @cd libs/apr-util && $(MAKE) - @$(TOUCH_TARGET) - -libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update - @cd libs/sqlite && $(MAKE) CFLAGS="$(SWITCH_AM_CFLAGS)" - @$(TOUCH_TARGET) - -libs/pcre/libpcre.la: libs/pcre libs/pcre/.update - @cd libs/pcre && $(MAKE) - @$(TOUCH_TARGET) - -libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update - @cd libs/srtp && $(MAKE) - @$(TOUCH_TARGET) - -if USE_INTREE_RESAMPLE -libs/libresample/libresample.la: libs/libresample libs/libresample/.update - @cd libs/libresample && $(MAKE) - @$(TOUCH_TARGET) -endif - core: $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la @@ -311,19 +252,12 @@ svn update $(MAKE) -j install -libs/openzap/Makefile: - cd libs/openzap && autoconf - cd libs/openzap && ./configure - -update-clean: clean modwipe uninstall libs/openzap/Makefile - cd libs/sofia-sip && $(MAKE) clean - cd libs/openzap && $(MAKE) clean +update-clean: clean modwipe uninstall sure: update-clean all speedy-sure: update-clean $(MAKE) -j core - cd libs/sofia-sip && $(MAKE) -j $(MAKE) -j modules current: update-clean @@ -374,11 +308,11 @@ -e "s,@INSTALL\@,$(INSTALL)," \ -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \ \ - -e "s|@CFLAGS\@|$(CFLAGS) `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags`|" \ + -e "s|@CFLAGS\@|$(CFLAGS)|" \ -e "s|@INCLUDES\@|-I$(PREFIX)/include|" \ -e "s|@SOLINK\@|$(SOLINK)|" \ -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \ - -e "s|@LIBS\@|`$(switch_srcdir)/libs/apr/apr-1-config --libs` `$(switch_srcdir)/libs/apr-util/apu-1-config --libs`|" \ + -e "s|@LIBS\@|$(LIBS)|" \ scripts/fsxs.in > scripts/fsxs eclean: clean @@ -390,10 +324,6 @@ rm -f *.tar *.tgz *.gz megaclean: eclean modclean - rm -f `find ./libs -name \*.la` - -libclean: - @for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; rm -f .built; popd; done modules.conf: if test -f $@; then touch $@; else cp build/modules.conf.in $@ ;fi Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/acinclude.m4 ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/acinclude.m4 (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/acinclude.m4 Mon Apr 21 17:08:58 2008 @@ -6,5 +6,5 @@ m4_include([build/config/ac_gcc_x86_cpuid.m4]) m4_include([build/config/ax_lib_mysql.m4]) m4_include([build/config/ax_check_java.m4]) -m4_include([libs/apr/build/apr_common.m4]) +m4_include([build/config/apr_common.m4]) m4_include([build/config/libcurl.m4]) Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/bootstrap.sh ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/bootstrap.sh (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/bootstrap.sh Mon Apr 21 17:08:58 2008 @@ -3,10 +3,6 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="codec/ilbc curl iax iksemel voipcodecs \ - js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ - speex sqlite srtp xmlrpc-c openzap"; - if [ ! -f modules.conf ]; then cp build/modules.conf.in modules.conf @@ -66,7 +62,7 @@ # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -libtool=`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14` +libtool=`which glibtool libtool libtool15 libtool14 2>/dev/null | head -n 1` lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." @@ -99,166 +95,12 @@ exit 1 fi -echo "Entering directory ${LIBDIR}/apr" -cd ${LIBDIR}/apr - -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -# bootstrap: Build the support scripts needed to compile from a -# checked-out version of the source code. - - -libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` +libtoolize=`which glibtoolize libtoolize15 libtoolize14 libtoolize 2>/dev/null | head -n 1` if [ "x$libtoolize" = "x" ]; then echo "libtoolize not found in path" exit 1 fi -# Create the libtool helper files -# -# Note: we copy (rather than link) them to simplify distribution. -# Note: APR supplies its own config.guess and config.sub -- we do not -# rely on libtool's versions -# -echo "Copying libtool helper files ..." - -# Remove any libtool files so one can switch between libtool 1.3 -# and libtool 1.4 by simply rerunning the bootstrap script. -(cd build ; rm -f ltconfig ltmain.sh libtool.m4) - -$libtoolize --copy --automake - -if [ -f libtool.m4 ]; then - ltfile=`pwd`/libtool.m4 -else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} - # Expecting the code above to be very portable, but just in case... - if [ -z "$ltfile" -o ! -f "$ltfile" ]; then - ltpath=`dirname $libtoolize` - ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 - fi -fi - -if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 -fi - -echo "bootstrap: Using libtool.m4 at ${ltfile}." - -cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - -# libtool.m4 from 1.6 requires ltsugar.m4 -if [ -f ltsugar.m4 ]; then - rm -f build/ltsugar.m4 - mv ltsugar.m4 build/ltsugar.m4 -fi - -# Clean up any leftovers -rm -f aclocal.m4 libtool.m4 - -# -# Generate the autoconf header and ./configure -# -echo "Creating include/arch/unix/apr_private.h.in ..." -${AUTOHEADER:-autoheader} - -echo "Creating configure ..." -### do some work to toss config.cache? -${AUTOCONF:-autoconf} - -# Remove autoconf 2.5x's cache directory -rm -rf autom4te*.cache - -# fix for FreeBSD (at least): -# libtool.m4 is in share/aclocal, while e.g. aclocal19 only looks in share/aclocal19 -# get aclocal's default directory and include the libtool.m4 directory via -I if -# it's in a different location - -aclocal_dir="`${ACLOCAL:-aclocal} --print-ac-dir`" - -if [ -n "${aclocal_dir}" -a -n "${ltfile}" -a "`dirname ${ltfile}`" != "${aclocal_dir}" ] ; then - ACLOCAL_OPTS="-I `dirname ${ltfile}`" -fi - -echo "Entering directory ${LIBDIR}/apr-util" -cd ${LIBDIR}/apr-util -./buildconf - -echo "Entering directory ${LIBDIR}/openmrcp" -cd ${LIBDIR}/openmrcp -./bootstrap - - -for i in ${SUBDIRS} -do - echo "Entering directory ${LIBDIR}/${i}" - cd ${LIBDIR}/${i} - rm -f aclocal.m4 - CFFILE= - if [ -f ${LIBDIR}/${i}/configure.in ] ; then - CFFILE="${LIBDIR}/${i}/configure.in" - else - if [ -f ${LIBDIR}/${i}/configure.ac ] ; then - CFFILE="${LIBDIR}/${i}/configure.ac" - fi - fi - - if [ ! -z ${CFFILE} ] ; then - - LTTEST=`grep "AC_PROG_LIBTOOL" ${CFFILE}` - LTTEST2=`grep "AM_PROG_LIBTOOL" ${CFFILE}` - AMTEST=`grep "AM_INIT_AUTOMAKE" ${CFFILE}` - AHTEST=`grep "AC_CONFIG_HEADERS" ${CFFILE}` - - echo "Creating aclocal.m4" - ${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} ${ACLOCAL_FLAGS} - -#only run if AC_PROG_LIBTOOL is in configure.in/configure.ac - if [ ! -z "${LTTEST}" -o "${LTTEST2}" ] ; then - echo "Running libtoolize..." - $libtoolize --force --copy ; - fi - - echo "Creating configure" - ${AUTOCONF:-autoconf} - -#only run if AC_CONFIG_HEADERS is found in configure.in/configure.ac - if [ ! -z "${AHTEST}" ] ; then - echo "Running autoheader..." - ${AUTOHEADER:-autoheader} ; - fi - -#only run if AM_INIT_AUTOMAKE is in configure.in/configure.ac - if [ ! -z "${AMTEST}" ] ; then - if [ -f ${LIBDIR}/${i}/Makefile.am ] ; then - echo "Creating Makefile.in" - ${AUTOMAKE:-automake} --no-force --add-missing --copy ; - fi - fi - rm -rf autom4te*.cache - fi -done - -cd ${BASEDIR} - rm -f aclocal.m4 ${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} $libtoolize --copy --automake 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 17:08:58 2008 @@ -75,8 +75,8 @@ RESAMPLE_LIB= RESAMPLE_CFLAGS= if test "${enable_resample}" = "yes"; then - RESAMPLE_LIB="libs/libresample/libresample.la" - RESAMPLE_CFLAGS="-I${switch_srcdir}/libs/libresample/include" + PKG_CHECK_MODULES([RESAMPLE],[resample]) + RESAMPLE_LIB="${RESAMPLE_LIBS}" else AC_DEFINE([DISABLE_RESAMPLE],[],[Disable the embedded resampler]) fi @@ -87,8 +87,8 @@ AM_CONDITIONAL([USE_INTREE_RESAMPLE],[test "${enable_resample}" = "yes"]) # set defaults for use on all platforms -SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" -SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" +SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include" +SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include" SWITCH_AM_LDFLAGS="-lm -L/usr/local/lib" #set SOLINK variable based on compiler and host @@ -174,6 +174,56 @@ APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99) +PKG_CHECK_MODULES([apr],[apr-1]) +SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $apr_CFLAGS" +SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $apr_LIBS" + +PKG_CHECK_MODULES([apr_util],[apr-util-1]) +SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $apr_util_CFLAGS" +SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $apr_util_LIBS" + +PKG_CHECK_MODULES([pcre],[libpcre]) +SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $pcre_CFLAGS" +SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $pcre_LIBS" + +PKG_CHECK_MODULES([sqlite3],[sqlite3]) +SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $sqlite3_CFLAGS" +SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $sqlite3_LIBS" + +PKG_CHECK_MODULES([SOFIA],[sofia-sip-ua]) +AC_SUBST(SOFIA_CFLAGS) +AC_SUBST(SOFIA_LIBS) + +PKG_CHECK_MODULES([SPEEX],[speex]) +AC_SUBST(SPEEX_CFLAGS) +AC_SUBST(SPEEX_LIBS) + +PKG_CHECK_MODULES([SPIDERMONKEY],[libjs],[],[ +PKG_CHECK_MODULES([SPIDERMONKEY],[xulrunner-js],[],[ + +AC_CHECK_LIB(smjs, JS_BeginRequest, libjs=smjs, [ +AC_CHECK_LIB(js, JS_BeginRequest, libjs=js) +]) +PKG_CHECK_MODULES([NSPR],[nspr]) +SPIDERMONKEY_CFLAGS="${NSPR_CFLAGS} -I/usr/include/js -DXP_UNIX -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1" +SPIDERMONKEY_LIBS="${NSPR_LIBS} -l$libjs" + +]) +]) +AC_SUBST(SPIDERMONKEY_CFLAGS) +AC_SUBST(SPIDERMONKEY_LIBS) + +# TODO: make this automatic or something +SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS -lteletone" + +# TODO: make this automatic or something +SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS -I/usr/include/srtp" +SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS -lsrtp" + +# TODO: make this automatic or something +XMLRPC_CFLAGS="-I/usr/include/xmlrpc-c" +XMLRPC_LDFLAGS="-lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse -lxmlrpc_xmltok" + AC_SUBST(SWITCH_AM_CFLAGS) AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) @@ -460,30 +510,4 @@ AC_SUBST(OUR_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS) -# Run configure in all the subdirs -AC_CONFIG_SUBDIRS(libs/srtp) -AC_CONFIG_SUBDIRS(libs/sqlite) -AC_CONFIG_SUBDIRS(libs/libresample) -if test "$enable_core_libedit_support" = "yes" ; then - AC_CONFIG_SUBDIRS(libs/libedit) -fi -AC_CONFIG_SUBDIRS(libs/pcre) -AC_CONFIG_SUBDIRS(libs/apr) -AC_CONFIG_SUBDIRS(libs/apr-util) -AC_CONFIG_SUBDIRS(libs/voipcodecs) -AC_CONFIG_SUBDIRS(libs/codec/ilbc) -AC_CONFIG_SUBDIRS(libs/curl) -AC_CONFIG_SUBDIRS(libs/iax) -AC_CONFIG_SUBDIRS(libs/iksemel) -AC_CONFIG_SUBDIRS(libs/js/nsprpub) -AC_CONFIG_SUBDIRS(libs/js) -AC_CONFIG_SUBDIRS(libs/libdingaling) -AC_CONFIG_SUBDIRS(libs/libsndfile) -AC_CONFIG_SUBDIRS(libs/sofia-sip) -AC_CONFIG_SUBDIRS(libs/speex) -AC_CONFIG_SUBDIRS(libs/xmlrpc-c) -AC_CONFIG_SUBDIRS(libs/portaudio) -AC_CONFIG_SUBDIRS(libs/openmrcp) -AC_CONFIG_SUBDIRS(libs/openzap) - AC_OUTPUT Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_platform.h ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_platform.h (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_platform.h Mon Apr 21 17:08:58 2008 @@ -66,10 +66,6 @@ # pragma comment(lib, "odbc32.lib") #endif -#pragma include_alias(<libteletone.h>, <../../libs/libteletone/src/libteletone.h>) -#pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) -#pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) - #if (_MSC_VER >= 1400) // VC8+ #define switch_assert(expr) assert(expr);__analysis_assume( expr ) #endif Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/Makefile Mon Apr 21 17:08:58 2008 @@ -1,9 +1,7 @@ -BASE=../../../.. -UDNS_DIR=$(BASE)/libs/udns -LOCAL_CFLAGS=-I$(UDNS_DIR) -DHAVE_POLL -LOCAL_OBJS=$(UDNS_DIR)/udns_dn.o $(UDNS_DIR)/udns_dntosp.o $(UDNS_DIR)/udns_parse.o $(UDNS_DIR)/udns_misc.o \ -$(UDNS_DIR)/udns_rr_a.o $(UDNS_DIR)/udns_rr_ptr.o $(UDNS_DIR)/udns_rr_mx.o $(UDNS_DIR)/udns_rr_txt.o $(UDNS_DIR)/udns_bl.o \ -$(UDNS_DIR)/udns_rr_srv.o $(UDNS_DIR)/udns_rr_naptr.o $(UDNS_DIR)/udns_codes.o $(UDNS_DIR)/udns_resolver.o +UDNS_DIR=/usr +UDNS_INCL=$(UDNS_DIR)/include +LOCAL_CFLAGS=-I$(UDNS_INCL) -DHAVE_POLL +LOCAL_LDFLAGS=-ludns_s include $(BASE)/build/modmake.rules Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_enum/mod_enum.c Mon Apr 21 17:08:58 2008 @@ -32,6 +32,9 @@ #include <switch.h> #include <udns.h> +#ifndef dns_socket +typedef int dns_socket; +#endif #ifndef WIN32 #define closesocket close #endif @@ -491,6 +494,10 @@ goto done; } + if (dns_init(nctx, 0) < 0) { + return SWITCH_STATUS_FALSE; + } + fd = dns_open(nctx); if (fd < 0) { @@ -826,10 +833,6 @@ switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool); - if (dns_init(0) < 0) { - return SWITCH_STATUS_FALSE; - } - memset(&globals, 0, sizeof(globals)); do_load(); Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_ilbc/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_ilbc/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_ilbc/Makefile Mon Apr 21 17:08:58 2008 @@ -1,10 +1,3 @@ -BASE=../../../.. -ILBC_DIR=$(BASE)/libs/codec/ilbc -ILBCLA=$(ILBC_DIR)/libilbc.la -LOCAL_CFLAGS=-I$(ILBC_DIR)/src -LOCAL_LIBADD=$(ILBCLA) +LOCAL_CFLAGS=-I/usr/include/ilbc +LOCAL_LIBADD=-lilbc include $(BASE)/build/modmake.rules - -$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update - cd $(ILBC_DIR) && $(MAKE) - $(TOUCH_TARGET) Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_speex/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_speex/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_speex/Makefile Mon Apr 21 17:08:58 2008 @@ -1,12 +1,3 @@ -BASE=../../../.. - -SPEEX_DIR=$(BASE)/libs/speex -SPEEXLA=$(SPEEX_DIR)/libspeex/libspeex.la - -LOCAL_CFLAGS=-I$(SPEEX_DIR)/include -LOCAL_LIBADD=$(SPEEXLA) +LOCAL_CFLAGS=$(SPEEX_CFLAGS) +LOCAL_LDFLAGS=$(SPEEX_LIBS) include $(BASE)/build/modmake.rules - -$(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update - cd $(SPEEX_DIR)/libspeex && $(MAKE) - $(TOUCH_TARGET) Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_voipcodecs/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_voipcodecs/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/codecs/mod_voipcodecs/Makefile Mon Apr 21 17:08:58 2008 @@ -1,13 +1,4 @@ -BASE=../../../.. - -VOIPCODECS_DIR=$(BASE)/libs/voipcodecs -VOIPCODECS_LA=$(VOIPCODECS_DIR)/src/libvoipcodecs.la - -LOCAL_CFLAGS=-I$(VOIPCODECS_DIR)/src -LOCAL_LIBADD=$(VOIPCODECS_LA) +LOCAL_CFLAGS=-I/usr/include/voipcodecs +LOCAL_LIBADD=-lvoipcodecs include $(BASE)/build/modmake.rules - -$(VOIPCODECS_LA): $(VOIPCODECS_DIR) $(VOIPCODECS_DIR)/.update - cd $(VOIPCODECS_DIR) && $(MAKE) - $(TOUCH_TARGET) 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 17:08:58 2008 @@ -1,11 +1,3 @@ -BASE=../../../.. - -IAX_DIR=$(BASE)/libs/iax -IAXLA=$(IAX_DIR)/src/libiax.la -LOCAL_CFLAGS=-I$(IAX_DIR)/src -LOCAL_LIBADD=$(IAXLA) +LOCAL_CFLAGS=-I/usr/include +LOCAL_LDFLAGS=-liax include $(BASE)/build/modmake.rules - -$(IAXLA): $(IAX_DIR) $(IAX_DIR)/.update - cd $(IAX_DIR) && $(MAKE) - Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/Makefile.am Mon Apr 21 17:08:58 2008 @@ -12,23 +12,12 @@ MODNAME=mod_sofia -SOFIA_DIR=$(switch_builddir)/libs/sofia-sip -SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua -SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la - mod_LTLIBRARIES = mod_sofia.la mod_sofia_la_SOURCES = mod_sofia.c sofia.c sofia_glue.c sofia_presence.c sofia_reg.c mod_sofia.h mod_sofia_la_CFLAGS = $(AM_CFLAGS) -mod_sofia_la_CFLAGS += -I. -I$(SOFIAUA_DIR)/bnf -I$(SOFIAUA_DIR)/features -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/http -I$(SOFIAUA_DIR)/ipt -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/iptsec -I$(SOFIAUA_DIR)/msg -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/nea -I$(SOFIAUA_DIR)/nta -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/nth -I$(SOFIAUA_DIR)/nua -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/sdp -I$(SOFIAUA_DIR)/sip -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/soa -I$(SOFIAUA_DIR)/sresolv -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su -mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url -mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIALA) +mod_sofia_la_CFLAGS += -I. +mod_sofia_la_CFLAGS += $(SOFIA_CFLAGS) +mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIA_LIBS) mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined if ADD_ODBC @@ -47,14 +36,3 @@ cd $(SOFIA_DIR) && $(MAKE) $(TOUCH_TARGET) -../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) - -#install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) - -#$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la -# @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) -# @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ -# $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ -# else \ -# $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ -# fi Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 21 17:08:58 2008 @@ -39,6 +39,11 @@ #include "sofia-sip/sip_extra.h" #include "sofia-sip/tport_tag.h" +#ifndef ntatag_max_proceeding +NTA_DLL extern tag_typedef_t ntatag_max_proceeding; +#define NTATAG_MAX_PROCEEDING(x) ntatag_max_proceeding, tag_usize_v((x)) +#endif + extern su_log_t tport_log[]; extern su_log_t iptsec_log[]; extern su_log_t nea_log[]; Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/Makefile Mon Apr 21 17:08:58 2008 @@ -1,14 +1,3 @@ -BASE=../../../.. - -SNDFILE_DIR=$(BASE)/libs/libsndfile -SNDFILELA=$(SNDFILE_DIR)/src/libsndfile.la - -LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src -LOCAL_LIBADD=$(SNDFILELA) -LOCAL_OBJS= +LOCAL_LIBADD=-lsndfile include $(BASE)/build/modmake.rules - -$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update - cd $(SNDFILE_DIR) && $(MAKE) - $(TOUCH_TARGET) Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/Makefile Mon Apr 21 17:08:58 2008 @@ -5,10 +5,3 @@ LOCAL_LIBADD= include sm.mak - -depend_install: $(DESTDIR)$(libdir)/libjs.la - -$(DESTDIR)$(libdir)/libjs.la: $(JSLA) - cd $(JS_DIR)/nsprpub/ && $(MAKE) install - cd $(JS_DIR) && $(MAKE) install - Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/sm.mak Mon Apr 21 17:08:58 2008 @@ -1,14 +1,6 @@ -switch_srcdir=../../../.. -JS_DIR=$(switch_srcdir)/libs/js -JSLA=$(JS_DIR)/libjs.la +LOCAL_CFLAGS+=$(SPIDERMONKEY_CFLAGS) +LOCAL_LDFLAGS+=$(SPIDERMONKEY_LIBS) -LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1 -LOCAL_LDFLAGS+=$(JS_DIR)/nsprpub/pr/src/libnspr4.* -LOCAL_LIBADD+=$(JSLA) +LOCAL_CFLAGS+=-I../mod_spidermonkey -include $(switch_srcdir)/build/modmake.rules - -$(JSLA): $(JS_DIR) $(JS_DIR)/.update - cd $(JS_DIR)/nsprpub && $(MAKE) - cd $(JS_DIR) && $(MAKE) - $(TOUCH_TARGET) +include $(BASE)/build/modmake.rules Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/Makefile Mon Apr 21 17:08:58 2008 @@ -1,18 +1,4 @@ -BASE=../../../.. -XMLRPC_DIR=$(BASE)/libs/xmlrpc-c - -#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la -#dont ask... -XMLRPCLAS = $(XMLRPC_DIR)/src/*.o -XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la -XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la -XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.la - -LOCAL_LIBADD =$(XMLRPCLAS) -LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include +LOCAL_CFLAGS=$(XMLRPC_CFLAGS) +LOCAL_LDFLAGS=$(XMLRPC_LIBS) include $(BASE)/build/modmake.rules - -$(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update - cd $(XMLRPC_DIR) && $(MAKE) - $(TOUCH_TARGET) Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Apr 21 17:08:58 2008 @@ -42,7 +42,7 @@ #include <xmlrpc-c/abyss.h> #include <xmlrpc-c/server.h> #include <xmlrpc-c/server_abyss.h> -#include "../../libs/xmlrpc-c/lib/abyss/src/token.h" +#include "token.h" /* NOTE: From xmlrpc-c's internals */ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_rpc_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown); Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_hash.c ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_hash.c (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_hash.c Mon Apr 21 17:08:58 2008 @@ -35,7 +35,7 @@ #include <switch.h> #include "private/switch_core_pvt.h" #include <sqlite3.h> -#include "../../../libs/sqlite/src/hash.h" +#include "hash.h" /* NOTE: this comes from Sqlite internals */ struct switch_hash { Hash table; Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_state_machine.c ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_state_machine.c (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_state_machine.c Mon Apr 21 17:08:58 2008 @@ -192,7 +192,7 @@ } #include <sqlite3.h> -#include "../../../libs/sqlite/src/hash.h" +#include "hash.h" /* NOTE: From Sqlite interals */ //static switch_hash_t *stack_table = NULL; static Hash stack_table; Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c Mon Apr 21 17:08:58 2008 @@ -42,7 +42,7 @@ #undef PACKAGE #undef inline #include <datatypes.h> -#include <srtp.h> +#include "srtp.h" #define READ_INC(rtp_session) switch_mutex_lock(rtp_session->read_mutex); rtp_session->reading++ #define READ_DEC(rtp_session) switch_mutex_unlock(rtp_session->read_mutex); rtp_session->reading--