ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add vnc_sasl to new feature convencion 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-08-12 18:20:29 +02:00 committed by Anthony Liguori
parent 1be10ad28b
commit ea784e3b95
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@ -180,6 +180,7 @@ esac
brlapi="" brlapi=""
vde="" vde=""
vnc_tls="" vnc_tls=""
vnc_sasl=""
gprof="no" gprof="no"
debug_tcg="no" debug_tcg="no"
@ -193,7 +194,6 @@ slirp="yes"
fmod_lib="" fmod_lib=""
fmod_inc="" fmod_inc=""
oss_lib="" oss_lib=""
vnc_sasl="yes"
bsd="no" bsd="no"
linux="no" linux="no"
solaris="no" solaris="no"
@ -439,6 +439,8 @@ for opt do
;; ;;
--disable-vnc-sasl) vnc_sasl="no" --disable-vnc-sasl) vnc_sasl="no"
;; ;;
--enable-vnc-sasl) vnc_sasl="yes"
;;
--disable-slirp) slirp="no" --disable-slirp) slirp="no"
;; ;;
--disable-vde) vde="no" --disable-vde) vde="no"
@ -618,6 +620,7 @@ echo " --enable-brlapi enable BrlAPI"
echo " --disable-vnc-tls disable TLS encryption for VNC server" echo " --disable-vnc-tls disable TLS encryption for VNC server"
echo " --enable-vnc-tls enable 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-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-curses disable curses output"
echo " --disable-curl disable curl connectivity" echo " --disable-curl disable curl connectivity"
echo " --disable-bluez disable bluez stack connectivity" echo " --disable-bluez disable bluez stack connectivity"
@ -931,19 +934,23 @@ fi
########################################## ##########################################
# VNC SASL detection # VNC SASL detection
if test "$vnc_sasl" = "yes" ; then if test "$vnc_sasl" = "yes" ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF
#include <sasl/sasl.h> #include <sasl/sasl.h>
#include <stdio.h> #include <stdio.h>
int main(void) { sasl_server_init(NULL, "qemu"); return 0; } int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
EOF EOF
# Assuming Cyrus-SASL installed in /usr prefix # Assuming Cyrus-SASL installed in /usr prefix
vnc_sasl_cflags="" vnc_sasl_cflags=""
vnc_sasl_libs="-lsasl2" vnc_sasl_libs="-lsasl2"
if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
libs_softmmu="$vnc_sasl_libs $libs_softmmu" vnc_sasl=yes
else libs_softmmu="$vnc_sasl_libs $libs_softmmu"
vnc_sasl="no" else
if test "$vnc_sasl" = "yes" ; then
feature_not_found "vnc-sasl"
fi fi
vnc_sasl=no
fi
fi fi
########################################## ##########################################