[svn] GnuPG - r4392 - branches/STABLE-BRANCH-1-4

[svn author dshaw]

Author: dshaw
Date: 2006-12-21 18:51:36 +0100 (Thu, 21 Dec 2006)
New Revision: 4392

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
Log:
* configure.ac: Only check for libusb if we're building with card
support.  Noted by Gilles Espinasse.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2006-12-21 12:13:44 UTC (rev 4391)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2006-12-21 17:51:36 UTC (rev 4392)
@@ -1,3 +1,8 @@
+2006-12-21  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Only check for libusb if we're building with card
+	support.  Noted by Gilles Espinasse.
+
 2006-12-11  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (DISTCLEANFILES): Removed g10defs.h.

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2006-12-21 12:13:44 UTC (rev 4391)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2006-12-21 17:51:36 UTC (rev 4392)
@@ -1278,7 +1278,10 @@
 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