Merge branch 'master' of git://git.linphone.org/linphone

[linphone] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7bc526bbb288f379be0ad3ceae3f86cf1930a86b..0fcf38fc9529e1c806192cf8b0a852374ac430da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.5.99.0],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.6.0],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -656,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,