Revision 821601ea configure

b/configure
117 117
kvm_para=""
118 118
nptl=""
119 119
sdl=""
120
vnc="yes"
120 121
sparse="no"
121 122
uuid=""
122 123
vde=""
......
539 540
  ;;
540 541
  --enable-sdl) sdl="yes"
541 542
  ;;
543
  --disable-vnc) vnc="no"
544
  ;;
545
  --enable-vnc) vnc="yes"
546
  ;;
542 547
  --fmod-lib=*) fmod_lib="$optarg"
543 548
  ;;
544 549
  --fmod-inc=*) fmod_inc="$optarg"
......
836 841
echo "  --disable-werror         disable compilation abort on warning"
837 842
echo "  --disable-sdl            disable SDL"
838 843
echo "  --enable-sdl             enable SDL"
844
echo "  --disable-vnc            disable VNC"
845
echo "  --enable-vnc             enable VNC"
839 846
echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
840 847
echo "  --audio-drv-list=LIST    set audio drivers list:"
841 848
echo "                           Available drivers: $audio_possible_drivers"
......
1273 1280

  
1274 1281
##########################################
1275 1282
# VNC TLS detection
1276
if test "$vnc_tls" != "no" ; then
1283
if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
1277 1284
  cat > $TMPC <<EOF
1278 1285
#include <gnutls/gnutls.h>
1279 1286
int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
......
1293 1300

  
1294 1301
##########################################
1295 1302
# VNC SASL detection
1296
if test "$vnc_sasl" != "no" ; then
1303
if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then
1297 1304
  cat > $TMPC <<EOF
1298 1305
#include <sasl/sasl.h>
1299 1306
#include <stdio.h>
......
1315 1322

  
1316 1323
##########################################
1317 1324
# VNC JPEG detection
1318
if test "$vnc_jpeg" != "no" ; then
1325
if test "$vnc" = "yes" -a "$vnc_jpeg" != "no" ; then
1319 1326
cat > $TMPC <<EOF
1320 1327
#include <stdio.h>
1321 1328
#include <jpeglib.h>
......
1336 1343

  
1337 1344
##########################################
1338 1345
# VNC PNG detection
1339
if test "$vnc_png" != "no" ; then
1346
if test "$vnc" = "yes" -a "$vnc_png" != "no" ; then
1340 1347
cat > $TMPC <<EOF
1341 1348
//#include <stdio.h>
1342 1349
#include <png.h>
......
2495 2502
echo "Extra audio cards $audio_card_list"
2496 2503
echo "Block whitelist   $block_drv_whitelist"
2497 2504
echo "Mixer emulation   $mixemu"
2498
echo "VNC TLS support   $vnc_tls"
2499
echo "VNC SASL support  $vnc_sasl"
2500
echo "VNC JPEG support  $vnc_jpeg"
2501
echo "VNC PNG support   $vnc_png"
2502
echo "VNC thread        $vnc_thread"
2505
echo "VNC support       $vnc"
2506
if test "$vnc" = "yes" ; then
2507
    echo "VNC TLS support   $vnc_tls"
2508
    echo "VNC SASL support  $vnc_sasl"
2509
    echo "VNC JPEG support  $vnc_jpeg"
2510
    echo "VNC PNG support   $vnc_png"
2511
    echo "VNC thread        $vnc_thread"
2512
fi
2503 2513
if test -n "$sparc_cpu"; then
2504 2514
    echo "Target Sparc Arch $sparc_cpu"
2505 2515
fi
......
2649 2659
if test "$mixemu" = "yes" ; then
2650 2660
  echo "CONFIG_MIXEMU=y" >> $config_host_mak
2651 2661
fi
2662
if test "$vnc" = "yes" ; then
2663
  echo "CONFIG_VNC=y" >> $config_host_mak
2664
fi
2652 2665
if test "$vnc_tls" = "yes" ; then
2653 2666
  echo "CONFIG_VNC_TLS=y" >> $config_host_mak
2654 2667
  echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
......
2657 2670
  echo "CONFIG_VNC_SASL=y" >> $config_host_mak
2658 2671
  echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
2659 2672
fi
2660
if test "$vnc_jpeg" != "no" ; then
2673
if test "$vnc_jpeg" = "yes" ; then
2661 2674
  echo "CONFIG_VNC_JPEG=y" >> $config_host_mak
2662 2675
  echo "VNC_JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak
2663 2676
fi
2664
if test "$vnc_png" != "no" ; then
2677
if test "$vnc_png" = "yes" ; then
2665 2678
  echo "CONFIG_VNC_PNG=y" >> $config_host_mak
2666 2679
  echo "VNC_PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak
2667 2680
fi
2668
if test "$vnc_thread" != "no" ; then
2681
if test "$vnc_thread" = "yes" ; then
2669 2682
  echo "CONFIG_VNC_THREAD=y" >> $config_host_mak
2670 2683
fi
2671 2684
if test "$fnmatch" = "yes" ; then

Also available in: Unified diff