diff options
| author | Justus Winter <justus@g10code.com> | 2016-03-04 15:03:26 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-03-04 15:10:29 +0100 |
| commit | e997552161b2dd8aabf350adee14e208e1545aef (patch) | |
| tree | 8a916432047266828681ed230bdb905d75cb0e1e /configure.ac | |
| parent | g10: Drop superfluous declaration. (diff) | |
| download | gnupg2-e997552161b2dd8aabf350adee14e208e1545aef.tar.xz gnupg2-e997552161b2dd8aabf350adee14e208e1545aef.zip | |
build: Make libusb a hard requirement if the ccid driver is requested.
* 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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7770894e0..003e5091a 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ use_exec=yes use_trust_models=yes use_tofu=yes card_support=yes -use_ccid_driver=yes +use_ccid_driver=auto dirmngr_auto_start=yes use_tls_library=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. # # 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 *-mingw32*) LIBUSB_LIBS= @@ -824,7 +824,9 @@ if test x"$LIBUSB_LIBS" != x ; then AC_MSG_RESULT([not found]) usb_incdir="" have_libusb=no - use_ccid_driver=no + if test "$use_ccid_driver" != yes; then + use_ccid_driver=no + fi LIBUSB_LIBS="" fi @@ -1857,6 +1859,17 @@ if test "$require_iconv" = yes; then 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 AC_MSG_ERROR([[ *** |