X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=configure.ac;h=5bd0570cc35efd6710283249d6b2d7d5667024c2;hb=7b6bf69ed818b15c9aad31150a9d5a223bc46619;hp=4957eeb58ce4c83b26f990d438293a334900d872;hpb=aefc88365630f314ebaa5409dafa62d88e1a0771;p=linphone

diff --git a/configure.ac b/configure.ac
index 4957eeb5..5bd0570c 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
@@ -669,9 +656,7 @@ AC_ARG_ENABLE(tunnel,
 AM_CONDITIONAL(BUILD_TUNNEL, test x$enable_tunnel = xtrue)
 if test x$enable_tunnel = xtrue; then
 	PKG_CHECK_MODULES(TUNNEL, tunnel >= 0.3.3)
-	TUNNEL_CFLAGS+="-DTUNNEL_ENABLED"
-	AC_SUBST(TUNNEL_CFLAGS)
-	AC_SUBST(TUNNEL_LIBS)
+	AC_DEFINE(TUNNEL_ENABLED,1,[Tells tunnel extension is built-in])
 fi
 
 AC_ARG_ENABLE(msg-storage,
@@ -684,7 +669,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