From e1ceff16765b0342531709cf97d03ef0158c29d5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 16 Feb 2016 16:47:22 +0100 Subject: [PATCH] w32: Make scdaemon build again due to libusb problem. * configure.ac: Add hack to disable libusb for Windows. Also use $host instead of $target in the switch -- The new test for libusb does not support cross-compiling. As a quick workaround we disable libusb for Windows because we can't use it anyway. Signed-off-by: Werner Koch --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 81fde82bc..7770894e0 100644 --- a/configure.ac +++ b/configure.ac @@ -783,7 +783,11 @@ AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no) # # FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs. if test "$use_ccid_driver" = yes ; then - case $target in + case "${host}" in + *-mingw32*) + LIBUSB_LIBS= + LIBUSB_CPPFLAGS= + ;; *-*-darwin*) LIBUSB_LIBS="-lusb-1.0 -Wl,-framework,CoreFoundation -Wl,-framework,IOKit" ;; @@ -795,6 +799,8 @@ if test "$use_ccid_driver" = yes ; then LIBUSB_LIBS="-lusb-1.0" ;; esac +fi +if test x"$LIBUSB_LIBS" != x ; then AC_CHECK_LIB(usb-1.0, libusb_init, [ LIBUSB_LIBS="$LIBUSB_LIBS" have_libusb=yes ])