aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-12-21 17:51:36 +0000
committerDavid Shaw <[email protected]>2006-12-21 17:51:36 +0000
commit6a0d191411e53e30e02eaf70de2a892df4f9ebe9 (patch)
tree48362716fa5d9f3b0e73d09d6d187dc3432f1eda
parent* options.skel: Tweak some examples to match reality and update the (diff)
downloadgnupg-6a0d191411e53e30e02eaf70de2a892df4f9ebe9.tar.gz
gnupg-6a0d191411e53e30e02eaf70de2a892df4f9ebe9.zip
* configure.ac: Only check for libusb if we're building with card
support. Noted by Gilles Espinasse.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e62b672bb..1e27edf30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-21 David Shaw <[email protected]>
+
+ * configure.ac: Only check for libusb if we're building with card
+ support. Noted by Gilles Espinasse.
+
2006-12-11 Werner Koch <[email protected]>
* Makefile.am (DISTCLEANFILES): Removed g10defs.h.
diff --git a/configure.ac b/configure.ac
index 4ff3412d3..c75bf1bed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1278,7 +1278,10 @@ AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
AC_SUBST(ZLIBS)
# libusb allows us to use the integrated CCID smartcard reader driver.
-GNUPG_CHECK_LIBUSB
+# We don't need it if we don't have card support though.
+if test "$card_support" = yes ; then
+ GNUPG_CHECK_LIBUSB
+fi
# Check for readline support
GNUPG_CHECK_READLINE