- if test "$usb_redir" = "yes" ; then
-@@ -3970,9 +3969,6 @@
- if test "$target_softmmu" = "yes" ; then
- echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
-- if test "$smartcard_nss" = "yes" ; then
-- echo "subdir-$target: subdir-libcacard" >> $config_host_mak
-- fi
- case "$target_arch2" in
- i386|x86_64)
- echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
-@@ -4179,10 +4175,9 @@
- DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
- DIRS="$DIRS roms/seabios roms/vgabios"
- DIRS="$DIRS qapi-generated"
--DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
- FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
- FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
--FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
-+FILES="$FILES tests/tcg/lm32/Makefile"
- FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
- FILES="$FILES pc-bios/spapr-rtas/Makefile"
- FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
-diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c
---- qemu-kvm-1.2.0/hw/ccid-card-passthru.c 2012-09-06 10:31:27.000000000 +0200
-+++ qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c 2012-11-09 07:44:11.286748135 +0100
-@@ -12,7 +12,7 @@
- #include "qemu_socket.h"
- #include "monitor.h"
- #include "hw/ccid.h"
--#include "libcacard/vscard_common.h"
-+#include <cacard/vscard_common.h>
-
- #define DPRINTF(card, lvl, fmt, ...) \
- do { \