April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

06 Apr '09

Author: stkn Date: Mon Apr 6 17:26:27 2009 New Revision: 12931 Log: hmm, enclosing the libtool var in {} does not work? remove them for now... Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 17:26:27 2009 @@ -130,7 +130,7 @@ # 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}'`" +LIBTOOL_MAJOR_VERSION="`$libtool --version 2>/dev/null| sed -e 's/([[^)]]*)//g;s/^[[^0-9]]*//;s/[[- ]].*//g;q'| awk -F . '{print $1}'`" AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}]) LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN"

1 0

[commit] r12930 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 17:16:11 2009 New Revision: 12930 Log: cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Mon Apr 6 17:16:11 2009 @@ -49,12 +49,3 @@ ../../../../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

1 0

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

06 Apr '09

Author: stkn Date: Mon Apr 6 16:59:48 2009 New Revision: 12929 Log: libtool detection code working now, put both checks together, add some info messages and a short note Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 16:59:48 2009 @@ -76,9 +76,6 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL -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}'` - #Check for compiler vendor AX_COMPILER_VENDOR @@ -126,12 +123,23 @@ ;; esac +## +# detect libtool major version, +# set libtool library extension based on this +# to work around some brokeness when using 'la' with libtool-1.5 +# +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}'`" +AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}]) LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN" -if test "$LIBTOOL_MAJOR_VERSION" = "2"; then +if test "${LIBTOOL_MAJOR_VERSION}" = "2" ; then LIBTOOL_LIB_EXTEN="la" fi +AC_MSG_RESULT([using libtool library extension... ${LIBTOOL_LIB_EXTEN}]) + # Enable 64 bit build AC_ARG_ENABLE(64,

1 0

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

06 Apr '09

Author: anthm Date: Mon Apr 6 16:46:59 2009 New Revision: 12928 Log: null out some more stuff 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 Mon Apr 6 16:46:59 2009 @@ -268,6 +268,15 @@ if (tech_pvt->other_session) { if (switch_core_session_read_lock(tech_pvt->other_session) != SWITCH_STATUS_SUCCESS) { tech_pvt->other_session = NULL; + tech_pvt->other_tech_pvt = NULL; + tech_pvt->other_channel = NULL; + switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); + if (b_tech_pvt) { + b_tech_pvt->other_session = NULL; + b_tech_pvt->other_tech_pvt = NULL; + b_tech_pvt->other_channel = NULL; + switch_clear_flag_locked(b_tech_pvt, TFLAG_LINKED); + } switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; }

1 0

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

06 Apr '09

Author: mikej Date: Mon Apr 6 16:28:00 2009 New Revision: 12927 Log: add libtool major version detection to configure in prep for supporting both libtool 2.x and 1.5.x at the same time Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 16:28:00 2009 @@ -129,7 +129,7 @@ LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN" -if test "$LIBTOOL_MAJOR_VERSION" -eq "2"; then +if test "$LIBTOOL_MAJOR_VERSION" = "2"; then LIBTOOL_LIB_EXTEN="la" fi

1 0

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

06 Apr '09

Author: mikej Date: Mon Apr 6 16:25:28 2009 New Revision: 12926 Log: add libtool major version detection to configure in prep for supporting both libtool 2.x and 1.5.x at the same time Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 16:25:28 2009 @@ -76,7 +76,7 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL -libtool=$(switch_builddir)/libtool +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}'` #Check for compiler vendor

1 0

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

06 Apr '09

Author: anthm Date: Mon Apr 6 16:01:14 2009 New Revision: 12925 Log: null out pointer on failed read lock 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 Mon Apr 6 16:01:14 2009 @@ -267,6 +267,7 @@ if (tech_pvt->other_session) { if (switch_core_session_read_lock(tech_pvt->other_session) != SWITCH_STATUS_SUCCESS) { + tech_pvt->other_session = NULL; switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; }

1 0

[commit] r12924 - freeswitch/trunk/src/include
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 15:54:50 2009 New Revision: 12924 Log: build: fix older gcc build (FSBUILD-150) Modified: freeswitch/trunk/src/include/switch.h Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Mon Apr 6 15:54:50 2009 @@ -71,6 +71,7 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> +#include <string.h> #ifdef _MSC_VER #include <Winsock2.h> #if _MSC_VER < 1500 @@ -85,7 +86,6 @@ #else #include <strings.h> #endif -#include <string.h> #include <sys/stat.h> #include <limits.h> #include <sys/types.h>

1 0

[commit] r12923 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 15:26:37 2009 New Revision: 12923 Log: mod_opal: disable visibility support broken in newer gcc (MODENDP-190) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Mon Apr 6 15:26:37 2009 @@ -26,12 +26,20 @@ #ifndef __FREESWITCH_MOD_OPAL__ #define __FREESWITCH_MOD_OPAL__ +#if defined(__GNUC__) && defined(HAVE_VISIBILITY) +#pragma GCC visibility push(default) +#endif + #include <ptlib.h> #include <opal/manager.h> #include <opal/localep.h> #include <h323/h323ep.h> #include <iax2/iax2ep.h> +#if defined(__GNUC__) && defined(HAVE_VISIBILITY) +#pragma GCC visibility pop +#endif + #undef strcasecmp #undef strncasecmp

1 0

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

06 Apr '09

Author: mikej Date: Mon Apr 6 14:54:30 2009 New Revision: 12922 Log: add libtool major version detection to configure in prep for supporting both libtool 2.x and 1.5.x at the same time Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 14:54:30 2009 @@ -76,6 +76,9 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL +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}'` + #Check for compiler vendor AX_COMPILER_VENDOR @@ -123,6 +126,13 @@ ;; esac + +LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN" + +if test "$LIBTOOL_MAJOR_VERSION" -eq "2"; then + LIBTOOL_LIB_EXTEN="la" +fi + # Enable 64 bit build AC_ARG_ENABLE(64, [AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) @@ -278,6 +288,7 @@ AC_SUBST(PLATFORM_CORE_DEPLIBS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN) +AC_SUBST(LIBTOOL_LIB_EXTEN) # Checks for header files. AC_HEADER_DIRENT

1 0