[Pkg-gnupg-commit] [gnupg2] 35/205: w32: Make scdaemon build again due to libusb problem.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit e1ceff16765b0342531709cf97d03ef0158c29d5
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Feb 16 16:47:22 2016 +0100

    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 at gnupg.org>
---
 configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 81fde82..7770894 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 ])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git