From patchwork Thu Feb 3 22:45:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 81762 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 ozlabs.org (Postfix) with ESMTPS id 3E4A7B70E9 for ; Fri, 4 Feb 2011 11:23:06 +1100 (EST) Received: from localhost ([127.0.0.1]:50232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl8Gr-0006jU-K4 for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 18:07:25 -0500 Received: from [140.186.70.92] (port=41548 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl7wP-0006J9-VD for qemu-devel@nongnu.org; Thu, 03 Feb 2011 17:46:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl7wO-0008By-Sd for qemu-devel@nongnu.org; Thu, 03 Feb 2011 17:46:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl7wO-0008Bq-Js for qemu-devel@nongnu.org; Thu, 03 Feb 2011 17:46:16 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p13MkFpw021570 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Feb 2011 17:46:15 -0500 Received: from playa.redhat.com (vpn-200-5.tlv.redhat.com [10.35.200.5]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p13Mjrfl002491 for ; Thu, 3 Feb 2011 17:46:14 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Fri, 4 Feb 2011 00:45:49 +0200 Message-Id: <1296773152-23279-14-git-send-email-alevy@redhat.com> In-Reply-To: <1296773152-23279-1-git-send-email-alevy@redhat.com> References: <1296773152-23279-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 13/16] smartcard, configure: add --enable-smartcard-nss, report only nss 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: Alon Levy --- configure | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 8b86c9a..27e5488 100755 --- a/configure +++ b/configure @@ -174,8 +174,8 @@ trace_backend="nop" trace_file="trace" spice="" rbd="" -smartcard="yes" -smartcard_nss="yes" +smartcard="" +smartcard_nss="" # parse CC options first for opt do @@ -725,6 +725,10 @@ for opt do ;; --enable-smartcard) smartcard="yes" ;; + --disable-smartcard-nss) smartcard_nss="no" + ;; + --enable-smartcard-nss) smartcard_nss="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -922,6 +926,8 @@ echo " --enable-spice enable spice" echo " --enable-rbd enable building the rados block device (rbd)" echo " --disable-smartcard disable smartcard support" echo " --enable-smartcard enable smartcard support" +echo " --disable-smartcard-nss disable smartcard nss support" +echo " --enable-smartcard-nss enable smartcard nss support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2249,16 +2255,22 @@ fi # check for libcacard for smartcard support if test "$smartcard" != "no" ; then + smartcard="yes" smartcard_cflags="-I\$(SRC_PATH)/libcacard" libcacard_libs=$($pkg_config --libs nss 2>/dev/null) libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null) # TODO - what's the minimal nss version we support? - if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then - smartcard_nss="yes" - QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" - LIBS="$libcacard_libs $LIBS" - else - smartcard_nss="no" + if test "$smartcard_nss" != "no"; then + if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then + smartcard_nss="yes" + QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" + LIBS="$libcacard_libs $LIBS" + else + if test "$smartcard_nss" == "yes"; then + feature_not_found "nss" + fi + smartcard_nss="no" + fi fi fi if test "$smartcard" == "no" ; then