1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-02-16 16:47:22 +01:00
parent 44b02e1beb
commit e1ceff1676
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B

View File

@ -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 ])