From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 20 Mar 2013 11:36:13 +0000 (+0100)
Subject: fix exosip dscp api detection
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=c5c826d8f46c7e9aa5655aef7a353d7e1a528ffa

fix exosip dscp api detection
---

diff --git a/configure.ac b/configure.ac
index 4957eeb5..7bc526bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,19 +444,6 @@ fi
 dnl setup flags for exosip library
 LP_SETUP_EXOSIP
 
-dnl check exosip support of DSCP in exosip
-AC_MSG_CHECKING([for DSCP support in exosip])
-AC_TRY_COMPILE([#include <eXosip2/eXosip.h>],
-	[int dscp=0;eXosip_set_option(EXOSIP_OPT_SET_DSCP,&dscp);],
-	has_exosip_dscp=yes,
-	has_exosip_dscp=no
-)
-AC_MSG_RESULT($has_exosip_dscp)
-if test "$has_exosip_dscp" = "yes" ; then
-	AC_DEFINE( HAVE_EXOSIP_DSCP, 1, [Define if exosip dscp available] )
-fi
-
-
 if test "$console_ui" = "true" ; then
 	dnl check gnu readline
 	LP_CHECK_READLINE
@@ -684,7 +671,6 @@ AC_ARG_ENABLE(msg-storage,
 	[enable_msg_storage=auto]
 )
 
-echo "enable_msg_storage = $enable_msg_storage"
 
 AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
 if test x$enable_msg_storage != xfalse; then
diff --git a/m4/exosip.m4 b/m4/exosip.m4
index 31769e00..e7c72647 100644
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -20,6 +20,19 @@ EXOSIP_LIBS="$OSIP_LIBS -leXosip2  "
 CPPFLAGS_save=$CPPFLAGS
 CPPFLAGS="$OSIP_CFLAGS $CPPFLAGS"
 AC_CHECK_HEADER([eXosip2/eXosip.h], ,AC_MSG_ERROR([Could not find eXosip2 headers !]))
+
+dnl check exosip support of DSCP in exosip
+AC_MSG_CHECKING([for DSCP support in exosip])
+AC_TRY_COMPILE([#include <eXosip2/eXosip.h>],
+	[int dscp=0;eXosip_set_option(EXOSIP_OPT_SET_DSCP,&dscp);],
+	has_exosip_dscp=yes,
+	has_exosip_dscp=no
+)
+AC_MSG_RESULT($has_exosip_dscp)
+if test "$has_exosip_dscp" = "yes" ; then
+	AC_DEFINE( HAVE_EXOSIP_DSCP, 1, [Define if exosip dscp available] )
+fi
+
 CPPFLAGS=$CPPFLAGS_save
 
 
diff --git a/mediastreamer2 b/mediastreamer2
index 45c9c651..430cc137 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 45c9c65168a9912bd2aa97344b396771ff1cdaf0
+Subproject commit 430cc1376d68b1a8d82799357abea9e3e1c536f8