X-Git-Url: http://sjero.net/git/?p=linphone;a=blobdiff_plain;f=configure.ac;h=7bc526bbb288f379be0ad3ceae3f86cf1930a86b;hp=9cb828e82320649de65e8c46b9d4a574bc87edfe;hb=5ddf9069f0c5f487b65ef5b64dbd19a56066b350;hpb=57e5d55ab7f0a0024a8118081206a849b075ac7b

diff --git a/configure.ac b/configure.ac
index 9cb828e8..7bc526bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,7 +183,12 @@ AC_ARG_ENABLE(upnp,
 )
 
 if test "$build_upnp" != "false" ; then
-	PKG_CHECK_MODULES([LIBUPNP], [libupnp], [build_upnp=true],
+	PKG_CHECK_MODULES([LIBUPNP], [libupnp], 
+		[if  pkg-config --atleast-version=1.6 "libupnp < 1.7"; then
+			build_upnp=true
+		else
+			AC_MSG_ERROR([libupnp >= 1.6 < 1.5 required.])
+		fi],
 		[if test "$build_upnp" == "true" ; then
 			AC_MSG_ERROR([libupnp not found.])
 		else
@@ -439,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
@@ -670,21 +662,30 @@ if test x$enable_tunnel = xtrue; then
 fi
 
 AC_ARG_ENABLE(msg-storage,
-	[AS_HELP_STRING([--enable-msg-storage=[yes/no]], [Turn on compilation of message storage (default=yes)])],
+	[AS_HELP_STRING([--enable-msg-storage=[yes/no]], [Turn on compilation of message storage (default=auto)])],
 	[case "${enableval}" in
 		yes)	enable_msg_storage=true ;;
 		no)	enable_msg_storage=false ;;
 		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-msg-storage) ;;
 	esac],
-	[enable_msg_storage=true]
+	[enable_msg_storage=auto]
 )
+
+
 AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
-if test x$enable_msg_storage = xtrue; then
-	PKG_CHECK_MODULES(SQLITE3,[ sqlite3 >= 3.7.0],[],[
-		AC_MSG_ERROR([sqlite3 required for message storage not found.])] )
-	SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
-	AC_SUBST(SQLITE3_CFLAGS)
-	AC_SUBST(SQLITE3_LIBS)
+if test x$enable_msg_storage != xfalse; then
+	PKG_CHECK_MODULES(SQLITE3,[ sqlite3 >= 3.7.0],[
+		SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
+		AC_SUBST(SQLITE3_CFLAGS)
+		AC_SUBST(SQLITE3_LIBS)
+		enable_msg_storage=true
+		],[
+		if test x$enable_msg_storage = xtrue; then 
+			AC_MSG_ERROR([sqlite3 required for message storage not found.])
+		fi
+		enable_msg_storage=false
+		] )
+	
 fi