security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

build: Make libusb a hard requirement if the ccid driver is requested.

Browse Source 
* configure.ac: Print an error message and die if the internal ccid
driver is requested but no suitable libusb is found.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-03-04 15:03:26 +01:00
parent 1e4b782300
commit e997552161
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -111,7 +111,7 @@ use_exec=yes
use_trust_models=yes use_trust_models=yes
use_tofu=yes use_tofu=yes
card_support=yes card_support=yes
use_ccid_driver=yes use_ccid_driver=auto
dirmngr_auto_start=yes dirmngr_auto_start=yes
use_tls_library=no use_tls_library=no
large_secmem=no large_secmem=no
@ -782,7 +782,7 @@ AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
# libusb allows us to use the integrated CCID smartcard reader driver. # libusb allows us to use the integrated CCID smartcard reader driver.
# #
# FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs. # FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
if test "$use_ccid_driver" = yes ; then if test "$use_ccid_driver" = auto || test "$use_ccid_driver" = yes; then
case "${host}" in case "${host}" in
*-mingw32*) *-mingw32*)
LIBUSB_LIBS= LIBUSB_LIBS=
@ -824,7 +824,9 @@ if test x"$LIBUSB_LIBS" != x ; then
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
usb_incdir="" usb_incdir=""
have_libusb=no have_libusb=no
if test "$use_ccid_driver" != yes; then
use_ccid_driver=no use_ccid_driver=no
fi
LIBUSB_LIBS="" LIBUSB_LIBS=""
fi fi
@ -1857,6 +1859,17 @@ if test "$require_iconv" = yes; then
fi fi
fi fi
if test "$use_ccid_driver" = yes; then
if test "$have_libusb" != yes; then
die=yes
AC_MSG_NOTICE([[
***
*** You need libusb to build the internal ccid driver. Please
*** install a libusb suitable for your system.
***]])
fi
fi
if test "$die" = "yes"; then if test "$die" = "yes"; then
AC_MSG_ERROR([[ AC_MSG_ERROR([[
*** ***