[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/20] Add vnc_tls to new feature convencion
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 07/20] Add vnc_tls to new feature convencion |
Date: |
Wed, 12 Aug 2009 18:20:28 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index c51d9d3..30b82c6 100755
--- a/configure
+++ b/configure
@@ -181,6 +181,7 @@ esac
brlapi=""
vde=""
+vnc_tls=""
gprof="no"
debug_tcg="no"
@@ -194,7 +195,6 @@ slirp="yes"
fmod_lib=""
fmod_inc=""
oss_lib=""
-vnc_tls="yes"
vnc_sasl="yes"
bsd="no"
linux="no"
@@ -458,6 +458,8 @@ for opt do
;;
--disable-vnc-tls) vnc_tls="no"
;;
+ --enable-vnc-tls) vnc_tls="yes"
+ ;;
--disable-vnc-sasl) vnc_sasl="no"
;;
--disable-slirp) slirp="no"
@@ -640,6 +642,7 @@ echo " --disable-xen disable xen backend driver
support"
echo " --disable-brlapi disable BrlAPI"
echo " --enable-brlapi enable BrlAPI"
echo " --disable-vnc-tls disable TLS encryption for VNC server"
+echo " --enable-vnc-tls enable TLS encryption for VNC server"
echo " --disable-vnc-sasl disable SASL encryption for VNC server"
echo " --disable-curses disable curses output"
echo " --disable-curl disable curl connectivity"
@@ -933,18 +936,22 @@ fi
##########################################
# VNC TLS detection
-if test "$vnc_tls" = "yes" ; then
-cat > $TMPC <<EOF
+if test "$vnc_tls" != "no" ; then
+ cat > $TMPC <<EOF
#include <gnutls/gnutls.h>
int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0;
}
EOF
- vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
- vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
- if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
- libs_softmmu="$vnc_tls_libs $libs_softmmu"
- else
- vnc_tls="no"
+ vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
+ vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
+ if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
+ vnc_tls=yes
+ libs_softmmu="$vnc_tls_libs $libs_softmmu"
+ else
+ if test "$vnc_tls" = "yes" ; then
+ feature_not_found "vnc-tls"
fi
+ vnc_tls=no
+ fi
fi
##########################################
--
1.6.2.5
- [Qemu-devel] [PATCH 00/20] Make --enable-foo a requirement, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 02/20] Use the same structure for list of libs in curses and pthread, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 01/20] Make vnc configure options less verbose., Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 03/20] Add feature configure help, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 07/20] Add vnc_tls to new feature convencion,
Juan Quintela <=
- [Qemu-devel] [PATCH 04/20] Add error message for feature not found, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 06/20] Add vde to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 08/20] Add vnc_sasl to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 05/20] Add brlapi to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 09/20] Add curses to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 10/20] Add curl to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 12/20] Add nptl to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 11/20] Add pthread to new feature convencion, Juan Quintela, 2009/08/12