ACK.
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
On Fri, Mar 13, 2015 at 8:45 PM, Jeremy White <jwh...@codeweavers.com> wrote:
>
> Signed-off-by: Jeremy White <jwh...@codeweavers.com>
> ---
> configure | 38 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/configure b/configure
> index b858756..f22dbae 100755
> --- a/configure
> +++ b/configure
> @@ -307,6 +307,7 @@ trace_file="trace"
> spice=""
> rbd=""
> smartcard_nss=""
> +smartcard_pcsc=""
> libusb=""
> usb_redir=""
> opengl=""
> @@ -1043,6 +1044,10 @@ for opt do
> ;;
> --enable-smartcard-nss) smartcard_nss="yes"
> ;;
> + --disable-smartcard-pcsc) smartcard_pcsc="no"
> + ;;
> + --enable-smartcard-pcsc) smartcard_pcsc="yes"
> + ;;
> --disable-libusb) libusb="no"
> ;;
> --enable-libusb) libusb="yes"
> @@ -1373,6 +1378,8 @@ Advanced options (experts only):
> --enable-libnfs enable nfs support
> --disable-smartcard-nss disable smartcard nss support
> --enable-smartcard-nss enable smartcard nss support
> + --disable-smartcard-pcsc disable smartcard pcsc passthru support
> + --enable-smartcard-pcsc enable smartcard pcsc passthru support
> --disable-libusb disable libusb (for usb passthrough)
> --enable-libusb enable libusb (for usb passthrough)
> --disable-usb-redir disable usb network redirection support
> @@ -3723,6 +3730,30 @@ EOF
> fi
> fi
>
> +# check for pcsclite for smartcard passthru support
> +# TODO - Add support for Winscard
> +if test "$smartcard_pcsc" != "no"; then
> + cat > $TMPC << EOF
> +#include <winscard.h>
> +int main(void) { SCardEstablishContext(0, 0, 0, 0); return 0; }
> +EOF
> + pcsc_libs="$($pkg_config --libs libpcsclite 2>/dev/null)"
> + pcsc_cflags="$($pkg_config --cflags libpcsclite 2>/dev/null)"
> + test_cflags="$pcsc_cflags"
> + if test "$werror" = "yes"; then
> + test_cflags="-Werror $test_cflags"
> + fi
> + if test -n "$libtool" &&
> + compile_prog "$test_cflags" "$pcsc_libs"; then
> + smartcard_pcsc="yes"
> + else
> + if test "$smartcard_pcsc" = "yes"; then
> + feature_not_found "pcsc" "Install libpcsclite"
> + fi
> + smartcard_pcsc="no"
> + fi
> +fi
> +
> # check for libusb
> if test "$libusb" != "no" ; then
> if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
> @@ -4396,6 +4427,7 @@ fi
> echo "rbd support $rbd"
> echo "xfsctl support $xfs"
> echo "nss used $smartcard_nss"
> +echo "pcsc used $smartcard_pcsc"
> echo "libusb $libusb"
> echo "usb net redir $usb_redir"
> echo "OpenGL support $opengl"
> @@ -4756,6 +4788,12 @@ if test "$smartcard_nss" = "yes" ; then
> echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
> fi
>
> +if test "$smartcard_pcsc" = "yes" ; then
> + echo "CONFIG_SMARTCARD_PCSC=y" >> $config_host_mak
> + echo "PCSC_LIBS=$pcsc_libs" >> $config_host_mak
> + echo "PCSC_CFLAGS=$pcsc_cflags" >> $config_host_mak
> +fi
> +
> if test "$libusb" = "yes" ; then
> echo "CONFIG_USB_LIBUSB=y" >> $config_host_mak
> fi
> --
> 1.7.10.4
>
>
--
Marc-André Lureau
