From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MbGbI-00046F-5G
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MbGbC-0003zB-Mf
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:54 -0400
Received: from [199.232.76.173] (port=34675 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MbGbC-0003yu-As
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:50 -0400
Received: from mx2.redhat.com ([66.187.237.31]:44183)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <quintela@redhat.com>) id 1MbGbB-0002YJ-DX
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:49 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7CGMmlF014770
	for <qemu-devel@nongnu.org>; Wed, 12 Aug 2009 12:22:48 -0400
From: Juan Quintela <quintela@redhat.com>
Date: Wed, 12 Aug 2009 18:20:28 +0200
Message-Id: <6af6ac2510ce0b1dc43e5f0c8ae9d0c34b1f19bb.1250093910.git.quintela@redhat.com>
In-Reply-To: <cover.1250093910.git.quintela@redhat.com>
References: <cover.1250093910.git.quintela@redhat.com>
In-Reply-To: <cover.1250093910.git.quintela@redhat.com>
References: <cover.1250093910.git.quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 07/20] Add vnc_tls to new feature convencion
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 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