Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
	mediastreamer2
	oRTP

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index ff078ccf8f50c3de00b8905666b5c8c58c940a26..389179008af6666b922328a51ac2edb18a07ef55 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -446,7 +446,6 @@ void sal_root_ca(Sal* ctx, const char* rootCa) {
        if (ctx->rootCa)
                ms_free(ctx->rootCa);
        ctx->rootCa = ms_strdup(rootCa);
-       ms_error("YIPI : %s == %s\n", rootCa, ctx->rootCa);
 }
 
 static int extract_received_rport(osip_message_t *msg, const char **received, int *rportval,SalTransport* transport){

diff --git a/m4/exosip.m4 b/m4/exosip.m4
index cf1db587db3bca1925573a83a288cd39affaf353..2c21b129dd9890dbb74146c7ad190d692ad4ee1a 100644 (file)
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -25,9 +25,9 @@ dnl check for eXosip2 libs
 LDFLAGS_save=$LDFLAGS
 LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS"
 LIBS_save=$LIBS
-AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove],
+AC_CHECK_LIB([eXosip2],[eXosip_set_tls_ctx],
        [],
-       [AC_MSG_ERROR([Could not find eXosip2 library with version >= 3.0.2 !])],
+       [AC_MSG_ERROR([Could not find eXosip2 library with version >= 3.5.0 !])],
        [-losipparser2 -losip2 ])
 AC_CHECK_LIB([eXosip2],[eXosip_get_version],
        [AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])],