gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Monday, January 3, 2005 @ 16:18:24
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

* configure.ac: Use new GNUPG_CHECK_LIBUSB macro.


--------------+
 ChangeLog    |    4 ++++
 configure.ac |   22 +++++-----------------
 2 files changed, 9 insertions(+), 17 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.231 gnupg/ChangeLog:1.232
--- gnupg/ChangeLog:1.231	Thu Dec 30 04:31:19 2004
+++ gnupg/ChangeLog	Mon Jan  3 16:18:24 2005
@@ -1,3 +1,7 @@
+2005-01-03  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Use new GNUPG_CHECK_LIBUSB macro.
+
 2004-12-28  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Better implementation for the SRV check.  We don't
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.123 gnupg/configure.ac:1.124
--- gnupg/configure.ac:1.123	Thu Dec 30 04:31:19 2004
+++ gnupg/configure.ac	Mon Jan  3 16:18:24 2005
@@ -1,6 +1,6 @@
-dnl Configure.ac script for GnuPG
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-dnl               2004 Free Software Foundation, Inc.
+dnl configure.ac script for GnuPG
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl               2005 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GnuPG.
 dnl
@@ -19,7 +19,7 @@
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision: 1.123 $)dnl
+dnlAC_REVISION($Revision: 1.124 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -1179,20 +1179,8 @@
 AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
 AC_SUBST(ZLIBS)
 
-
-#
 # libusb allows us to use the integrated CCID smartcard reader driver.
-#
-LIBUSB_LIBS=""
-if test "$card_support" = yes; then
-    AC_CHECK_LIB(usb, usb_bulk_write,
-                 [ LIBUSB_LIBS="$LIBUSB_LIBS -lusb"
-                   AC_DEFINE(HAVE_LIBUSB,1,
-                   [defined if libusb is available])
-                 ])
-fi
-AC_SUBST(LIBUSB_LIBS)
-AC_CHECK_FUNCS(usb_get_busses)
+GNUPG_CHECK_LIBUSB
 
 # Check for readline support
 GNUPG_CHECK_READLINE