mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-18 03:28:07 +00:00
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
This commit is contained in:
Guillaume Beraudo
commit
6dc58d3363
8 changed files with 24 additions and 63 deletions
4
NEWS
4
NEWS
|
|
@ -1,3 +1,7 @@
|
|||
linphone-3.4.2 -- March 3rd, 2011
|
||||
* fix problems with webcams on windows
|
||||
Requires mediastreamer-2.7.2
|
||||
|
||||
linphone-3.4.1 -- February 17th, 2011
|
||||
* bugfixes
|
||||
* gtk executable is renamed "linphone" (was linphone-3 before)
|
||||
|
|
|
|||
15
configure.ac
15
configure.ac
|
|
@ -1,6 +1,6 @@
|
|||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT([linphone],[3.4.1],[linphone-developers@nongnu.org])
|
||||
AC_INIT([linphone],[3.4.2],[linphone-developers@nongnu.org])
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
|
||||
|
||||
|
|
@ -253,6 +253,18 @@ AC_CHECK_FUNCS(getifaddrs)
|
|||
dnl check for osip2
|
||||
LP_CHECK_OSIP2
|
||||
|
||||
dnl conditionnal build for ssl
|
||||
AC_ARG_ENABLE(ssl,
|
||||
[ --enable-ssl Turn on ssl support compiling. Required for sip tls. default = false],
|
||||
[case "${enableval}" in
|
||||
yes) build_ssl=true ;;
|
||||
no) build_ssl=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-ssl) ;;
|
||||
esac],[build_ssl=false])
|
||||
|
||||
if test "$build_ssl" = "true"; then
|
||||
PKG_CHECK_MODULES(OPENSSL, libssl >= 0.9.8)
|
||||
fi
|
||||
dnl setup flags for exosip library
|
||||
LP_SETUP_EXOSIP
|
||||
|
||||
|
|
@ -272,7 +284,6 @@ dnl Furthermore it is good to repeat here all mediastreamer2 toggles
|
|||
dnl since top-level configure --help will not print them.
|
||||
|
||||
PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, build_speex=yes)
|
||||
AC_SUBST(SPEEX_LIBS)
|
||||
|
||||
dnl conditionnal build of video support
|
||||
AC_ARG_ENABLE(video,
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
|
|||
liblinphone_la_LIBADD= \
|
||||
$(EXOSIP_LIBS) \
|
||||
$(MEDIASTREAMER_LIBS) \
|
||||
$(ORTP_LIBS)
|
||||
$(ORTP_LIBS) $(OPENSSL_LIBS)
|
||||
|
||||
if BUILD_WIN32
|
||||
liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
|
||||
|
|
@ -54,15 +54,11 @@ noinst_PROGRAMS=test_lsd test_ecc
|
|||
|
||||
test_lsd_SOURCES=test_lsd.c
|
||||
|
||||
test_lsd_LDADD=liblinphone.la \
|
||||
$(MEDIASTREAMER_LIBS) \
|
||||
$(ORTP_LIBS)
|
||||
test_lsd_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
|
||||
|
||||
test_ecc_SOURCES=test_ecc.c
|
||||
|
||||
test_ecc_LDADD=liblinphone.la \
|
||||
$(MEDIASTREAMER_LIBS) \
|
||||
$(ORTP_LIBS)
|
||||
test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -496,10 +496,6 @@ static void sip_config_read(LinphoneCore *lc)
|
|||
ipv6=lp_config_get_int(lc->config,"sip","use_ipv6",-1);
|
||||
if (ipv6==-1){
|
||||
ipv6=0;
|
||||
if (host_has_ipv6_network()){
|
||||
if (lc->vtable.display_message)
|
||||
lc->vtable.display_message(lc,_("Your machine appears to be connected to an IPv6 network. By default linphone always uses IPv4. Please update your configuration if you want to use IPv6"));
|
||||
}
|
||||
}
|
||||
linphone_core_enable_ipv6(lc,ipv6);
|
||||
memset(&tr,0,sizeof(tr));
|
||||
|
|
|
|||
|
|
@ -345,52 +345,6 @@ bool_t lp_spawn_command_line_sync(const char *command, char **result,int *comman
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
#if defined(HAVE_GETIFADDRS) && defined(INET6)
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <ifaddrs.h>
|
||||
bool_t host_has_ipv6_network()
|
||||
{
|
||||
struct ifaddrs *ifp;
|
||||
struct ifaddrs *ifpstart;
|
||||
bool_t ipv6_present=FALSE;
|
||||
|
||||
if (getifaddrs (&ifpstart) < 0)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
for (ifp=ifpstart; ifp != NULL; ifp = ifp->ifa_next)
|
||||
{
|
||||
if (!ifp->ifa_addr)
|
||||
continue;
|
||||
|
||||
switch (ifp->ifa_addr->sa_family) {
|
||||
case AF_INET:
|
||||
|
||||
break;
|
||||
case AF_INET6:
|
||||
ipv6_present=TRUE;
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
freeifaddrs (ifpstart);
|
||||
|
||||
return ipv6_present;
|
||||
}
|
||||
#else
|
||||
|
||||
bool_t host_has_ipv6_network()
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
static ortp_socket_t create_socket(int local_port){
|
||||
struct sockaddr_in laddr;
|
||||
ortp_socket_t sock;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
./bin/avcodec-52.dll
|
||||
./bin/avutil-50.dll
|
||||
./bin/libeXosip2-6.dll
|
||||
./bin/libogg.dll
|
||||
./bin/libtheora.dll
|
||||
./bin/libogg-0.dll
|
||||
./bin/libtheora-0.dll
|
||||
./bin/libxml2-2.dll
|
||||
./bin/libosip2-6.dll
|
||||
./bin/libosipparser2-6.dll
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CPPFLAGS=$CPPFLAGS_save
|
|||
|
||||
dnl check for eXosip2 libs
|
||||
LDFLAGS_save=$LDFLAGS
|
||||
LDFLAGS="$OSIP_LIBS $LDFLAGS"
|
||||
LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS"
|
||||
LIBS_save=$LIBS
|
||||
AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove],
|
||||
[],
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 9412db625a9f00e6de4c612dbc69ab1f98822d63
|
||||
Subproject commit fee15bc174996771973a27bf974d740e7f657bf6
|
||||
Loading…
Add table
Reference in a new issue