Merge remote-tracking branch 'private/dev_videoios'

[linphone] / configure.ac

diff --git a/configure.ac b/configure.ac
index f99e1dab49d741776281e6776c348135a8f5ba46..568f46b73d1c6e4e705b9c172ff072081e42d977 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.4.99.2],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.4.99.4],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -372,13 +372,14 @@ AC_ARG_ENABLE(alsa,
         *) AC_MSG_ERROR(bad value ${enableval} for --enable-alsa) ;;
       esac],[alsa=true])
 
-AC_ARG_ENABLE(artsc,
-      [  --enable-artsc    Turn on artsc (kde) sound input/output (auto) ],
+AC_ARG_ENABLE(zrtp,
+      [  --enable-zrtp    Turn on zrtp support - UNFINISHED],
       [case "${enableval}" in
-        yes) artsc=true ;;
-        no)  artsc=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-artsc) ;;
-      esac],[artsc=false])
+        yes) zrtp=true ;;
+        no)  zrtp=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-zrtp) ;;
+      esac],[zrtp=false])
+
 
 AC_ARG_ENABLE(portaudio,
       [  --enable-portaudio    Turn on portaudio native support compiling],
@@ -395,6 +396,7 @@ AM_CONDITIONAL(ARMBUILD, test x$use_arm_toolchain = xyes)
 dnl compilation of gtk user interface
 AM_CONDITIONAL(BUILD_GTK_UI, [test x$gtk_ui = xtrue ] )
 AM_CONDITIONAL(BUILD_WIN32, test x$mingw_found = xyes )
+AM_CONDITIONAL(BUILD_ZRTP, test x$zrtp = xtrue)
 
 dnl check getenv
 AH_TEMPLATE([HAVE_GETENV])