From patchwork Tue Jan 11 08:42:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 78317 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 8E328B7043 for ; Tue, 11 Jan 2011 21:34:50 +1100 (EST) Received: from localhost ([127.0.0.1]:33676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcZuE-0005c7-Ib for incoming@patchwork.ozlabs.org; Tue, 11 Jan 2011 03:48:42 -0500 Received: from [140.186.70.92] (port=38414 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcZrX-0004tr-H0 for qemu-devel@nongnu.org; Tue, 11 Jan 2011 03:45:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PcZrD-0001n5-Eb for qemu-devel@nongnu.org; Tue, 11 Jan 2011 03:45:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PcZrD-0001mw-7h for qemu-devel@nongnu.org; Tue, 11 Jan 2011 03:45:35 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0B8jYs2018857 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Jan 2011 03:45:34 -0500 Received: from playa.redhat.com ([10.3.112.19]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p0B8gkTn025449 for ; Tue, 11 Jan 2011 03:45:18 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Tue, 11 Jan 2011 10:42:38 +0200 Message-Id: <1294735359-4009-8-git-send-email-alevy@redhat.com> In-Reply-To: <1294735359-4009-1-git-send-email-alevy@redhat.com> References: <1294735359-4009-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 6/6] ccid: configure: add --enable-smartcard and --disable-smartcard 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 --- configure | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 4567057..ebc8250 100755 --- a/configure +++ b/configure @@ -748,6 +748,10 @@ for opt do ;; --enable-rbd) rbd="yes" ;; + --disable-smartcard) smartcard="no" + ;; + --enable-smartcard) smartcard="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -942,6 +946,8 @@ echo " Default:trace-" echo " --disable-spice disable spice" 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 "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2210,16 +2216,18 @@ EOF fi # check for libcacard for smartcard support -smartcard_cflags="-I\$(SRC_PATH)/libcacard" -libcacard_libs=$($pkgconfig --libs nss 2>/dev/null) -libcacard_cflags=$($pkgconfig --cflags nss) -# TODO - what's the minimal nss version we support? -if $pkgconfig --atleast-version=3.12.8 nss; then - smartcard="yes" - QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" - LIBS="$libcacard_libs $LIBS" -else - smartcard="no" +if test "$smartcard" != "no" ; then + smartcard_cflags="-I\$(SRC_PATH)/libcacard" + libcacard_libs=$($pkgconfig --libs nss 2>/dev/null) + libcacard_cflags=$($pkgconfig --cflags nss) + # TODO - what's the minimal nss version we support? + if $pkgconfig --atleast-version=3.12.8 nss; then + smartcard="yes" + QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" + LIBS="$libcacard_libs $LIBS" + else + smartcard="no" + fi fi ##########################################