Aac-eld add missing header according to RFC3640 3.3.6

[linphone] / configure.ac

diff --git a/configure.ac b/configure.ac
index 890fcba2d35761d4e15228cb76b17b0a90df72e1..7bc526bbb288f379be0ad3ceae3f86cf1930a86b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,7 @@ AC_CONFIG_COMMANDS([libtool-hacking],
 
 dnl Add the languages which your application supports here.
 PKG_PROG_PKG_CONFIG
-ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru zh_CN nb_NO zh_TW he"
+ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru zh_CN nb_NO zh_TW he sr"
 AC_SUBST(ALL_LINGUAS)
 AC_DEFINE_UNQUOTED(LINPHONE_ALL_LANGS, "$ALL_LINGUAS", [All supported languages])
 
@@ -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