diff options
| author | Werner Koch <[email protected]> | 2016-02-16 15:47:22 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-02-16 15:53:34 +0000 |
| commit | e1ceff16765b0342531709cf97d03ef0158c29d5 (patch) | |
| tree | 40598819b7ab60f87e5bcf7a61f422dea7f1888d | |
| parent | w32: Do not error out if gpgconf is not installed. (diff) | |
| download | gnupg-e1ceff16765b0342531709cf97d03ef0158c29d5.tar.gz gnupg-e1ceff16765b0342531709cf97d03ef0158c29d5.zip | |
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 <[email protected]>
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
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 ]) |