proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-09 06:36:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: remove CONFIG_SMARTCARD

Browse Source 
The passthru smartcard does not have the shared library dependency, build
it unconditionally.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-12-20 20:39:36 +01:00
parent 2c13ec50e7
commit afd347ab38
3 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -214,7 +214,6 @@ trace_backend="nop"
trace_file="trace" trace_file="trace"
spice="" spice=""
rbd="" rbd=""
smartcard=""
smartcard_nss="" smartcard_nss=""
usb_redir="" usb_redir=""
opengl="" opengl=""
@ -861,10 +860,6 @@ for opt do
;; ;;
--enable-xfsctl) xfs="yes" --enable-xfsctl) xfs="yes"
;; ;;
--disable-smartcard) smartcard="no"
;;
--enable-smartcard) smartcard="yes"
;;
--disable-smartcard-nss) smartcard_nss="no" --disable-smartcard-nss) smartcard_nss="no"
;; ;;
--enable-smartcard-nss) smartcard_nss="yes" --enable-smartcard-nss) smartcard_nss="yes"
@ -1128,8 +1123,6 @@ echo " --enable-spice enable spice"
echo " --enable-rbd enable building the rados block device (rbd)" echo " --enable-rbd enable building the rados block device (rbd)"
echo " --disable-libiscsi disable iscsi support" echo " --disable-libiscsi disable iscsi support"
echo " --enable-libiscsi enable iscsi support" echo " --enable-libiscsi enable iscsi support"
echo " --disable-smartcard disable smartcard support"
echo " --enable-smartcard enable smartcard support"
echo " --disable-smartcard-nss disable smartcard nss support" echo " --disable-smartcard-nss disable smartcard nss support"
echo " --enable-smartcard-nss enable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support"
echo " --disable-usb-redir disable usb network redirection support" echo " --disable-usb-redir disable usb network redirection support"
@ -2813,8 +2806,6 @@ EOF
fi fi
# check for libcacard for smartcard support # check for libcacard for smartcard support
if test "$smartcard" != "no" ; then
smartcard="yes"
smartcard_cflags="" smartcard_cflags=""
# TODO - what's the minimal nss version we support? # TODO - what's the minimal nss version we support?
if test "$smartcard_nss" != "no"; then if test "$smartcard_nss" != "no"; then
@ -2846,10 +2837,6 @@ EOF
smartcard_nss="no" smartcard_nss="no"
fi fi
fi fi
fi
if test "$smartcard" = "no" ; then
smartcard_nss="no"
fi
# check for usbredirparser for usb network redirection support # check for usbredirparser for usb network redirection support
if test "$usb_redir" != "no" ; then if test "$usb_redir" != "no" ; then
@ -3594,10 +3581,6 @@ if test "$spice" = "yes" ; then
echo "CONFIG_SPICE=y" >> $config_host_mak echo "CONFIG_SPICE=y" >> $config_host_mak
fi fi
if test "$smartcard" = "yes" ; then
echo "CONFIG_SMARTCARD=y" >> $config_host_mak
fi
if test "$smartcard_nss" = "yes" ; then if test "$smartcard_nss" = "yes" ; then
echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
echo "libcacard_libs=$libcacard_libs" >> $config_host_mak echo "libcacard_libs=$libcacard_libs" >> $config_host_mak

2
hw/Makefile.objs
View File

@ -37,7 +37,7 @@ common-obj-$(CONFIG_DMA) += dma.o
common-obj-$(CONFIG_I82374) += i82374.o common-obj-$(CONFIG_I82374) += i82374.o
common-obj-$(CONFIG_HPET) += hpet.o common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_APPLESMC) += applesmc.o common-obj-$(CONFIG_APPLESMC) += applesmc.o
common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o common-obj-y += ccid-card-passthru.o
common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
common-obj-y += fifo.o common-obj-y += fifo.o

2
hw/usb/Makefile.objs
View File

@ -4,11 +4,11 @@ common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
common-obj-y += libhw.o common-obj-y += libhw.o
common-obj-$(CONFIG_SMARTCARD) += dev-smartcard-reader.o
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
common-obj-y += core.o combined-packet.o bus.o desc.o dev-hub.o common-obj-y += core.o combined-packet.o bus.o desc.o dev-hub.o
common-obj-y += host-$(HOST_USB).o dev-bluetooth.o common-obj-y += host-$(HOST_USB).o dev-bluetooth.o
common-obj-y += dev-hid.o dev-storage.o dev-wacom.o common-obj-y += dev-hid.o dev-storage.o dev-wacom.o
common-obj-y += dev-serial.o dev-network.o dev-audio.o common-obj-y += dev-serial.o dev-network.o dev-audio.o
common-obj-y += dev-smartcard-reader.o
common-obj-y += dev-uas.o common-obj-y += dev-uas.o