[Pkg-gnupg-commit] [gnupg2] 06/205: scd: Fix detection of libusb.

[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 1b90b52a56b4f808ad29a7ef79aeafc03c7424b4
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 27 14:23:19 2016 +0100

    scd: Fix detection of libusb.
    
    * configure.ac (HAVE_LIBUSB): Clear if no header file was found.
    (LIBUSB_LIBS): Ditto.
    --
    
    This allows to use commit d0d9708 when libusb is installed without the
    header files.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 configure.ac | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c200069..81fde82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,10 +797,7 @@ if test "$use_ccid_driver" = yes ; then
    esac
    AC_CHECK_LIB(usb-1.0, libusb_init,
                 [ LIBUSB_LIBS="$LIBUSB_LIBS"
-                  AC_DEFINE(HAVE_LIBUSB,1, [defined if libusb is available])
-                  have_libusb=yes
-               ])
-   AC_DEFINE([HAVE_LIBUSB])
+                  have_libusb=yes ])
    AC_MSG_CHECKING([libusb include dir])
    usb_incdir_found="no"
    for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
@@ -819,9 +816,16 @@ if test "$use_ccid_driver" = yes ; then
      AC_MSG_RESULT([${usb_incdir}])
    else
      AC_MSG_RESULT([not found])
+     usb_incdir=""
+     have_libusb=no
      use_ccid_driver=no
+     LIBUSB_LIBS=""
    fi
-   if test "$usb_incdir" = ""; then
+
+   if test "$have_libusb" = yes; then
+     AC_DEFINE(HAVE_LIBUSB,1, [defined if libusb is available])
+   fi
+   if test x"$usb_incdir" = x; then
      LIBUSB_CPPFLAGS=""
    else
      LIBUSB_CPPFLAGS="-I${usb_incdir}"

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