windows fixes

diff --git a/Makefile.am b/Makefile.am
index d2c61489c9672ea3ad7e2ab45bc76f16890a9f6b..a1cd5594e364052b7282facd35f54e048c4b6dce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,10 @@ rpm:
 
 #a zip containing win32 binaries, suitable to generate an installer
 
+if BUILD_ZRTP
+WINBINDIST_FILES+=./bin/libzrtpcpp.dll ./bin/msys-1.0.dll ./bin/msys-crypto-1.0.0.dll
+endif
+
 other-cherrypick:
        cd $(GTK_PREFIX) && \
        for file in $(WINBINDIST_FILES) ; do \

diff --git a/configure.ac b/configure.ac
index ff2f4c729ebe671fffa6935ea9a25d946ccefb5a..8e42964a1e7230de6bd66980d2cb90c362806318 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -364,13 +364,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],
@@ -387,6 +388,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])

diff --git a/gtk/main.ui b/gtk/main.ui
index 9d02cb42b40fb3747f9f05086624a28c753189a1..0448795f71a1ad7db44c55467d493f80d1a852c2 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
+  <requires lib="gtk+" version="2.22"/>
   <object class="GtkWindow" id="dummy_conf_window">
     <property name="can_focus">False</property>
     <child>