April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12941 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 15:53:42 2009 New Revision: 12941 Log: temporary hack to ignore retry-after so we can avoid segfault (SFSIP-134) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Tue Apr 7 15:53:42 2009 @@ -1195,7 +1195,7 @@ } } - if (500 <= status && status < 600 && + if (0 && 500 <= status && status < 600 && sip->sip_retry_after && sip->sip_retry_after->af_delta < 32) { su_timer_t *timer; @@ -1219,6 +1219,7 @@ nua_client_report(cr, 100, phrase, NULL, orq, NULL); nta_outgoing_destroy(orq); cr->cr_status = 0, cr->cr_phrase = NULL; + return 1; }

1 0

[commit] r12940 - freeswitch/trunk
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 15:04:22 2009 New Revision: 12940 Log: hide warning from test in bootstrap Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Tue Apr 7 15:04:22 2009 @@ -196,7 +196,7 @@ # and libtool 1.4 by simply rerunning the bootstrap script. (cd build ; rm -f ltconfig ltmain.sh libtool.m4) -if ${libtoolize} -n --install 2>&1 >/dev/null ; then +if ${libtoolize} -n --install >/dev/null 2>&1 ; then $libtoolize --force --copy --install else $libtoolize --force --copy

1 0

[commit] r12939 - in freeswitch/trunk: build src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 14:48:50 2009 New Revision: 12939 Log: fix error loading mod_spidermonkey due to missing PR_* symbols Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Tue Apr 7 14:48:50 2009 @@ -112,9 +112,9 @@ @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Tue Apr 7 14:48:50 2009 @@ -3,7 +3,8 @@ JSLA=$(JS_DIR)/libjs.la 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_LIBADD+=$(JSLA) $(JS_DIR)/nsprpub/pr/src/libnspr4.* +LOCAL_LDFLAGS_POST=$(JS_DIR)/nsprpub/pr/src/libnspr4.* +LOCAL_LIBADD+=$(JSLA) include $(switch_srcdir)/build/modmake.rules

1 0

[commit] r12938 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 14:30:07 2009 New Revision: 12938 Log: tweak the configs to bind siptrace on and off to F10 and F11 Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Tue Apr 7 14:30:07 2009 @@ -10,8 +10,8 @@ <key name="7" value="console loglevel 0"/> <key name="8" value="console loglevel 7"/> <key name="9" value="sofia status profile internal"/> - <key name="10" value="fsctl pause"/> - <key name="11" value="fsctl resume"/> + <key name="10" value="sofia profile internal siptrace on"/> + <key name="11" value="sofia profile internal siptrace off"/> <key name="12" value="version"/> </cli-keybindings>

1 0

[commit] r12937 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: gmaruzz Date: Tue Apr 7 11:31:36 2009 New Revision: 12937 Log: skypiax: modified configs/startskype.sh to specify which unix user will start the Skype client instance. Thx to mbrancaleoni(a)voismart.it Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/startskype.sh Tue Apr 7 11:31:36 2009 @@ -11,14 +11,14 @@ /usr/bin/Xvfb :101 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & sleep 3 -# start a Skype client instance that will connect to the X server above, and will login to the Skype network using the "username password" you send to it on stdin. Here xxx would be the password and skypiax1 the username -echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype --pipelogin & +# as user "unixusername", start a Skype client instance that will connect to the X server above, and will login to the Skype network using the 'username password' you send to it on stdin. Here xxx would be the Skype password and skypiax1 the Skype username. Please note that the ".Skypiax" directory containing the Skype clients configurations MUST be in the home directory of the "unixusername" user. +su unixusername -c "/bin/echo 'skypiax1 xxx'| DISPLAY=:101 /usr/bin/skype --pipelogin &" sleep 7 /usr/bin/Xvfb :102 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & sleep 3 -echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype --pipelogin & +su unixusername -c "/bin/echo 'skypiax2 xxx'| DISPLAY=:102 /usr/bin/skype --pipelogin &" sleep 7 @@ -28,109 +28,109 @@ ###/usr/bin/Xvfb :103 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax3 xxx'| DISPLAY=:103 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :104 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax4 xxx'| DISPLAY=:104 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :105 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax5 xxx'| DISPLAY=:105 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :106 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax6 xxx'| DISPLAY=:106 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :107 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax7 xxx'| DISPLAY=:107 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :108 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax8 xxx'| DISPLAY=:108 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :109 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax9 xxx'| DISPLAY=:109 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :110 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax10 xxx'| DISPLAY=:110 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :111 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax11 xxx'| DISPLAY=:111 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :112 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax12 xxx'| DISPLAY=:112 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :113 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax13 xxx'| DISPLAY=:113 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :114 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax14 xxx'| DISPLAY=:114 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :115 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax15 xxx'| DISPLAY=:115 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :116 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax16 xxx'| DISPLAY=:116 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :117 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax17 xxx'| DISPLAY=:117 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :118 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax18 xxx'| DISPLAY=:118 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :119 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax19 xxx'| DISPLAY=:119 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###/usr/bin/Xvfb :120 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### -###echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype --pipelogin & +###su unixusername -c "/bin/echo 'skypiax20 xxx'| DISPLAY=:120 /usr/bin/skype --pipelogin &" ### ###sleep 7 ###

1 0

[commit] r12936 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: anthm Date: Tue Apr 7 11:06:30 2009 New Revision: 12936 Log: destroy codec Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Tue Apr 7 11:06:30 2009 @@ -113,10 +113,12 @@ if (tech_pvt->read_codec.implementation) { switch_core_codec_destroy(&tech_pvt->read_codec); + memset(&tech_pvt->read_codec, 0, sizeof(tech_pvt->read_codec)); } if (tech_pvt->write_codec.implementation) { switch_core_codec_destroy(&tech_pvt->write_codec); + memset(&tech_pvt->write_codec, 0, sizeof(tech_pvt->write_codec)); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setup codec %s/%d/%d\n", switch_channel_get_name(channel), iananame, rate, interval); @@ -366,6 +368,16 @@ switch_core_timer_destroy(&tech_pvt->timer); + if (tech_pvt->read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->read_codec); + memset(&tech_pvt->read_codec, 0, sizeof(tech_pvt->read_codec)); + } + + if (tech_pvt->write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->write_codec); + memset(&tech_pvt->write_codec, 0, sizeof(tech_pvt->write_codec)); + } + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12935 - freeswitch/trunk/src/include
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: anthm Date: Tue Apr 7 10:23:12 2009 New Revision: 12935 Log: drop divide by 2 from normalize func Modified: freeswitch/trunk/src/include/switch_utils.h Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Apr 7 10:23:12 2009 @@ -61,7 +61,7 @@ #define switch_samples_per_packet(rate, interval) ((uint32_t)((float)rate / (1000.0f / (float)interval))) #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768 -#define switch_normalize_to_16bit(n) if (n > SWITCH_SMAX) n = SWITCH_SMAX / 2; else if (n < SWITCH_SMIN) n = SWITCH_SMIN / 2; +#define switch_normalize_to_16bit(n) if (n > SWITCH_SMAX) n = SWITCH_SMAX; else if (n < SWITCH_SMIN) n = SWITCH_SMIN; #define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uh@%ui", \ codec->implementation->iananame, \ codec->implementation->samples_per_second, \

1 0

[commit] r12934 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 07 Apr '09

07 Apr '09

Author: mikej Date: Tue Apr 7 09:47:57 2009 New Revision: 12934 Log: fiz error loading mod_spidermonkey due to missing PR_* symbols Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Tue Apr 7 09:47:57 2009 @@ -3,8 +3,7 @@ JSLA=$(JS_DIR)/libjs.la 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_LIBADD+=$(JSLA) $(JS_DIR)/nsprpub/pr/src/libnspr4.* include $(switch_srcdir)/build/modmake.rules

1 0

[commit] r12933 - freeswitch/trunk
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: stkn Date: Mon Apr 6 18:29:41 2009 New Revision: 12933 Log: Add a fallback check in case libtool is not yet available in the builddir (get the version from build/config/ltmain.sh instead). print an error message and exit configure if that fails too Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 18:29:41 2009 @@ -131,6 +131,12 @@ AC_MSG_CHECKING([libtool major version]) libtool="${switch_builddir}/libtool" LIBTOOL_MAJOR_VERSION="`$libtool --version 2>/dev/null| sed -e 's/([[^)]]*)//g;s/^[[^0-9]]*//;s/[[- ]].*//g;q'| awk -F . '{print $1}'`" +if test -z "$LIBTOOL_MAJOR_VERSION" ; then + LIBTOOL_MAJOR_VERSION="`sed -n -e '/^VERSION/{s/^.*=$[[0-9]]\+$\..\+/\1/;p}' ${switch_srcdir}/build/config/ltmain.sh`" +fi +if test -z "$LIBTOOL_MAJOR_VERSION" ; then + AC_MSG_ERROR([Failed to detect your libtool version, please open a bug report on http://jira.freeswitch.org/] +fi AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}]) LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN"

1 0

[commit] r12932 - in freeswitch/trunk: . build
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 17:29:10 2009 New Revision: 12932 Log: libtool blah take 2 (FSBUILD-82) Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/build/modmake.rules.in Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Apr 6 17:29:10 2009 @@ -87,7 +87,7 @@ # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -libtool=`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14` +libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14`} 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." @@ -103,8 +103,11 @@ if test -z "$1"; then a=0 ; else a=$1;fi if test -z "$2"; then b=0 ; else b=$2;fi if test -z "$3"; then c=0 ; else c=$3;fi +lt_major=$a -if test "$a" -lt "2"; then +if test "$a" -eq "2"; then + lt_status="good" +elif test "$a" -lt "2"; then if test "$b" -lt "5" -o "$b" = "5" -a "$c" -lt "14" ; then lt_status="bad" fi @@ -121,6 +124,43 @@ exit 1 fi +# check libtoolize availability +if [ -n "${LIBTOOL}" ]; then + libtoolize=${LIBTOOLIZE:-`dirname "${libtool}"`/libtoolize} +else + libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`} +fi +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi +if [ ! -x "$libtoolize" ]; then + echo "$libtoolize does not exist or ist not executable" + exit 1 +fi + +# compare libtool and libtoolize version +ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +ltl_version=`echo $ltl_pversion|sed -e 's/$[a-z]*$$/.\1/'` +IFS=.; set $ltl_version; IFS=' ' + +if [ "x${lt_version}" != "x${ltl_version}" ]; then + echo "$libtool and $libtoolize have different versions" + exit 1 +fi + + +# +# Info output +# +echo "Bootstrapping using:" +echo " autoconf : ${AUTOCONF:-`which autoconf`}" +echo " automake : ${AUTOMAKE:-`which automake`}" +echo " aclocal : ${ACLOCAL:-`which aclocal`}" +echo " libtool : ${libtool} (${lt_version})" +echo " libtoolize: ${libtoolize}" +echo + echo "Entering directory ${LIBDIR}/apr" cd ${LIBDIR}/apr @@ -144,13 +184,6 @@ # bootstrap: Build the support scripts needed to compile from a # checked-out version of the source code. - -libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` -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. @@ -163,21 +196,30 @@ # and libtool 1.4 by simply rerunning the bootstrap script. (cd build ; rm -f ltconfig ltmain.sh libtool.m4) -$libtoolize --copy --automake +if ${libtoolize} -n --install 2>&1 >/dev/null ; then + $libtoolize --force --copy --install +else + $libtoolize --force --copy +fi 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"`} + if [ $lt_major -eq 2 ]; then + ltfindcmd="`sed -n \"/aclocaldir=/{s/.*=/echo /p;q;}\" < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`/libtool.m4} + else + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} + fi # 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 @@ -196,19 +238,6 @@ # 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 @@ -220,6 +249,24 @@ ACLOCAL_OPTS="-I `dirname ${ltfile}`" fi +### run aclocal +echo "Re-creating aclocal.m4 ..." +${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} + +### do some work to toss config.cache? +echo "Creating configure ..." +${AUTOCONF:-autoconf} + +# +# Generate the autoconf header +# +echo "Creating include/arch/unix/apr_private.h.in ..." +${AUTOHEADER:-autoheader} + + +# Remove autoconf 2.5x's cache directory +rm -rf autom4te*.cache + echo "Entering directory ${LIBDIR}/apr-util" cd ${LIBDIR}/apr-util ./buildconf @@ -251,7 +298,11 @@ #only run if AC_PROG_LIBTOOL is in configure.in/configure.ac if [ ! -z "${LTTEST}" -o "${LTTEST2}" ] ; then echo "Running libtoolize..." - $libtoolize --force --copy ; + if ${libtoolize} -n --install 2>&1 >/dev/null ; then + $libtoolize --force --copy --install + else + $libtoolize --force --copy + fi fi echo "Creating configure" Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Mon Apr 6 17:29:10 2009 @@ -10,7 +10,7 @@ INSTALL=@INSTALL@ GETLIB=@GETLIB@ LIBTOOL=@LIBTOOL@ -LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) +LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f CCLD = $(CC) CXXLD = $(CXX) @@ -29,7 +29,7 @@ DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH OSARCH=`uname -s` -DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@ SOLINK = @SOLINK@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) @@ -39,11 +39,11 @@ COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ CSOURCEFILE=$(MODNAME).c CXXSOURCEFILE=$(MODNAME).cpp @@ -81,7 +81,7 @@ extraclean: Makefile @$(RECURSE_MAKE) extraclean-modules || exit 1 -all-modules: local_depend $(MODNAME).$(DYNAMIC_LIB_EXTEN) local_all Makefile +all-modules: local_depend $(MODNAME).$(LIBTOOL_LIB_EXTEN) local_all Makefile depend-modules: local_depend clean-modules: local_clean mod_clean install-modules: all-modules depend_install local_install mod_install @@ -107,27 +107,27 @@ exit 1 ;\ fi -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).o +$(MODNAME).$(LIBTOOL_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).lo @echo Creating $@... @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean: - @rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *.lo *~ .libs $(LOCAL_OBJS) + @rm -fr *.$(LIBTOOL_LIB_EXTEN) *.o *.lo *~ .libs $(LOCAL_OBJS) -mod_install: $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) +mod_install: $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(LIBTOOL_LIB_EXTEN) -$(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(DYNAMIC_LIB_EXTEN):$(MODNAME).$(DYNAMIC_LIB_EXTEN) +$(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(LIBTOOL_LIB_EXTEN):$(MODNAME).$(LIBTOOL_LIB_EXTEN) @echo installing $< - @$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(MODINSTDIR) >/dev/null + @$(LTINSTALL) $(MODNAME).$(LIBTOOL_LIB_EXTEN) $(DESTDIR)$(MODINSTDIR) >/dev/null mod_uninstall: - @$(LTUNINSTALL) $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + @$(LTUNINSTALL) $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(LIBTOOL_LIB_EXTEN) # define these in your makefile if you wish local_all local_depend local_clean depend_install local_install local_distclean local_extraclean local_uninstall:

1 0