From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9rfL-00087T-Ml for qemu-devel@nongnu.org; Fri, 18 Dec 2015 04:49:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9rfH-0002qR-GA for qemu-devel@nongnu.org; Fri, 18 Dec 2015 04:49:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9rfH-0002qN-AV for qemu-devel@nongnu.org; Fri, 18 Dec 2015 04:49:31 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 82A7D356BEC for ; Fri, 18 Dec 2015 09:49:30 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Fri, 18 Dec 2015 10:49:12 +0100 Message-Id: <1450432152-15524-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] ccid: use libcacard.h from 2.5.1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com From: Marc-Andr=C3=A9 Lureau This cleans up a bit libcacard headers inclusion. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 7 ++++--- hw/usb/ccid-card-emulated.c | 5 +---- hw/usb/ccid-card-passthru.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure b/configure index b9552fd..65dc5ed 100755 --- a/configure +++ b/configure @@ -3981,17 +3981,18 @@ EOF fi =20 # check for smartcard support +libcacard_version=3D2.5.1 smartcard_cflags=3D"" if test "$smartcard" !=3D "no"; then - if $pkg_config libcacard; then + if $pkg_config "libcacard >=3D $libcacard_version"; then libcacard_cflags=3D$($pkg_config --cflags libcacard) libcacard_libs=3D$($pkg_config --libs libcacard) - QEMU_CFLAGS=3D"$QEMU_CFLAGS $libcacard_cflags" + QEMU_CFLAGS=3D $QEMU_CFLAGS $libcacard_cflags"" libs_softmmu=3D"$libs_softmmu $libcacard_libs" smartcard=3D"yes" else if test "$smartcard" =3D "yes"; then - feature_not_found "smartcard" "Install libcacard devel" + feature_not_found "smartcard" "Install libcacard(>=3D$libcac= ard_version) devel" fi smartcard=3D"no" fi diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 869a63c..25d3e3f 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -26,10 +26,7 @@ * the db parameter. */ =20 -#include -#include -#include -#include +#include =20 #include "qemu/thread.h" #include "sysemu/char.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 9f49c05..f4c276f 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -12,7 +12,7 @@ #include "qemu/error-report.h" #include "qemu/sockets.h" #include "ccid.h" -#include "cacard/vscard_common.h" +#include =20 #define DPRINTF(card, lvl, fmt, ...) \ do { \ --=20 2.5.0