From patchwork Thu Feb 3 21:07:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 81727 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]) by ozlabs.org (Postfix) with ESMTP id 9FF37B70EB for ; Fri, 4 Feb 2011 08:54:31 +1100 (EST) Received: from localhost ([127.0.0.1]:50683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl73G-0002Od-T8 for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 16:49:18 -0500 Received: from [140.186.70.92] (port=43858 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl6Oz-0002ct-Pa for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:07:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl6Ox-0006PW-Rw for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:07:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl6Ox-0006PM-II for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:07:39 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p13L7cEk015796 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Feb 2011 16:07:39 -0500 Received: from playa.tlv.redhat.com (dhcp-3-110.tlv.redhat.com [10.35.3.110]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p13L7F61004913 for ; Thu, 3 Feb 2011 16:07:38 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Thu, 3 Feb 2011 23:07:13 +0200 Message-Id: <1296767234-9480-17-git-send-email-alevy@redhat.com> In-Reply-To: <1296767234-9480-1-git-send-email-alevy@redhat.com> References: <1296767234-9480-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 16/17] ccid-card-emulated: don't link with NSS if --disable-smartcard-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 --- configure | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2cd73b4..4189814 100755 --- a/configure +++ b/configure @@ -2256,13 +2256,14 @@ 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) + smartcard_cflags="" # TODO - what's the minimal nss version we support? if test "$smartcard_nss" != "no"; then if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then smartcard_nss="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) QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" LIBS="$libcacard_libs $LIBS" else