]> sjero.net Git - linphone/blobdiff - configure.ac
Aac-eld add missing header according to RFC3640 3.3.6
[linphone] / configure.ac
index ae2d5938600b6283ec7c6e4842379b55a6d5b467..7bc526bbb288f379be0ad3ceae3f86cf1930a86b 100644 (file)
@@ -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
@@ -679,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