Commit bfb27bb7 authored by Guillaume Beraudo's avatar Guillaume Beraudo
Browse files

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

Conflicts:
	mediastreamer2
	oRTP
parents a2699e54 00d09892
...@@ -446,7 +446,6 @@ void sal_root_ca(Sal* ctx, const char* rootCa) { ...@@ -446,7 +446,6 @@ void sal_root_ca(Sal* ctx, const char* rootCa) {
if (ctx->rootCa) if (ctx->rootCa)
ms_free(ctx->rootCa); ms_free(ctx->rootCa);
ctx->rootCa = ms_strdup(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){ static int extract_received_rport(osip_message_t *msg, const char **received, int *rportval,SalTransport* transport){
......
...@@ -25,9 +25,9 @@ dnl check for eXosip2 libs ...@@ -25,9 +25,9 @@ dnl check for eXosip2 libs
LDFLAGS_save=$LDFLAGS LDFLAGS_save=$LDFLAGS
LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS" LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS"
LIBS_save=$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 ]) [-losipparser2 -losip2 ])
AC_CHECK_LIB([eXosip2],[eXosip_get_version], AC_CHECK_LIB([eXosip2],[eXosip_get_version],
[AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])], [AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment