[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/20] Add vnc_sasl to new feature convencion
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 08/20] Add vnc_sasl to new feature convencion |
Date: |
Wed, 12 Aug 2009 18:20:29 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 30b82c6..cd2f1e1 100755
--- a/configure
+++ b/configure
@@ -182,6 +182,7 @@ esac
brlapi=""
vde=""
vnc_tls=""
+vnc_sasl=""
gprof="no"
debug_tcg="no"
@@ -195,7 +196,6 @@ slirp="yes"
fmod_lib=""
fmod_inc=""
oss_lib=""
-vnc_sasl="yes"
bsd="no"
linux="no"
solaris="no"
@@ -462,6 +462,8 @@ for opt do
;;
--disable-vnc-sasl) vnc_sasl="no"
;;
+ --enable-vnc-sasl) vnc_sasl="yes"
+ ;;
--disable-slirp) slirp="no"
;;
--disable-vde) vde="no"
@@ -644,6 +646,7 @@ 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 " --enable-vnc-sasl enable SASL encryption for VNC server"
echo " --disable-curses disable curses output"
echo " --disable-curl disable curl connectivity"
echo " --disable-bluez disable bluez stack connectivity"
@@ -957,19 +960,23 @@ fi
##########################################
# VNC SASL detection
if test "$vnc_sasl" = "yes" ; then
-cat > $TMPC <<EOF
+ cat > $TMPC <<EOF
#include <sasl/sasl.h>
#include <stdio.h>
int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
EOF
- # Assuming Cyrus-SASL installed in /usr prefix
- vnc_sasl_cflags=""
- vnc_sasl_libs="-lsasl2"
- if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
- libs_softmmu="$vnc_sasl_libs $libs_softmmu"
- else
- vnc_sasl="no"
+ # Assuming Cyrus-SASL installed in /usr prefix
+ vnc_sasl_cflags=""
+ vnc_sasl_libs="-lsasl2"
+ if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
+ vnc_sasl=yes
+ libs_softmmu="$vnc_sasl_libs $libs_softmmu"
+ else
+ if test "$vnc_sasl" = "yes" ; then
+ feature_not_found "vnc-sasl"
fi
+ vnc_sasl=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, 2009/08/12
- [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 <=
- [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
- [Qemu-devel] [PATCH 13/20] Add bluez to new feature convencion, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 14/20] Add build_docs to new feature convention, Juan Quintela, 2009/08/12
- [Qemu-devel] [PATCH 15/20] Rename build_docs to docs, Juan Quintela, 2009/08/12