From patchwork Wed Aug 12 16:20:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id EEE53B6EDE for ; Thu, 13 Aug 2009 02:38:18 +1000 (EST) Received: from localhost ([127.0.0.1]:56291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbGq6-0006mm-3G for incoming@patchwork.ozlabs.org; Wed, 12 Aug 2009 12:38:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbGbI-00046R-8v 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 1MbGbD-000405-6r for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:55 -0400 Received: from [199.232.76.173] (port=34677 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbGbC-0003zp-Ut for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:50 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44184) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbGbC-0002YX-72 for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:22:50 -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 n7CGMnvk014778 for ; Wed, 12 Aug 2009 12:22:49 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7CGMmPZ012686; Wed, 12 Aug 2009 12:22:48 -0400 Received: from localhost.localdomain (vpn-12-196.rdu.redhat.com [10.11.12.196]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7CGMdlN001987; Wed, 12 Aug 2009 12:22:47 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 12 Aug 2009 18:20:29 +0200 Message-Id: <4541f81b9911bf970b91629afb76265bfdee9c90.1250093910.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 08/20] Add vnc_sasl to new feature convencion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- 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 < $TMPC < #include 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 ##########################################