diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-12 18:20:29 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 19:33:13 -0500 |
| commit | ea784e3b957086cd8d81b3f8f48422367b7ef4de (patch) | |
| tree | 54f57b19398744b219cdb22016aadad824927afe | |
| parent | 1be10ad28bb301f5aca980ab8241765b7f3d3011 (diff) | |
Add vnc_sasl to new feature convencion
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rwxr-xr-x | configure | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -180,6 +180,7 @@ esac brlapi="" vde="" vnc_tls="" +vnc_sasl="" gprof="no" debug_tcg="no" @@ -193,7 +194,6 @@ slirp="yes" fmod_lib="" fmod_inc="" oss_lib="" -vnc_sasl="yes" bsd="no" linux="no" solaris="no" @@ -439,6 +439,8 @@ for opt do ;; --disable-vnc-sasl) vnc_sasl="no" ;; + --enable-vnc-sasl) vnc_sasl="yes" + ;; --disable-slirp) slirp="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 " --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" @@ -931,19 +934,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 ########################################## |