[Pcsclite-cvs-commit] Drivers/ccid configure.in,1.11,1.12

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid
In directory quantz:/tmp/cvs-serv32712

Modified Files:
	configure.in 
Log Message:
do not try to find usb.h and other libusb files if --disable-libusb is
used. Needed if you only want to build the serial driver. Thanks to Niki
Waibel for the patch.


Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.in	25 Nov 2003 23:07:33 -0000	1.11
+++ configure.in	25 Nov 2003 23:10:59 -0000	1.12
@@ -99,21 +99,23 @@
 )
 
 dnl check if libusb is available
-AC_SUBST(LIBUSB)
-AC_CHECK_HEADERS(usb.h, [],
-	[ AC_MSG_ERROR([usb.h not found, use --enable-libusb=PATH]) ])
+if test "${use_libusb}" != false ; then
+	AC_SUBST(LIBUSB)
+	AC_CHECK_HEADERS(usb.h, [],
+		[ AC_MSG_ERROR([usb.h not found, use --enable-libusb=PATH]) ])
 
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $COREFOUNDATION $IOKIT"
-AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb"],
-	[ AC_MSG_ERROR([libusb not found]) ])
-LIBS="$ac_save_LIBS"
+	ac_save_LIBS="$LIBS"
+	LIBS="$LIBS $COREFOUNDATION $IOKIT"
+	AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb"],
+		[ AC_MSG_ERROR([libusb not found]) ])
+	LIBS="$ac_save_LIBS"
 
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $COREFOUNDATION $IOKIT"
-AC_CHECK_LIB(usb, usb_get_string_simple, [LIBUSB="$LIBUSB -lusb"],
-	[ AC_MSG_ERROR([your libusb is too old. install version 0.1.7 or above]) ])
-LIBS="$ac_save_LIBS"
+	ac_save_LIBS="$LIBS"
+	LIBS="$LIBS $COREFOUNDATION $IOKIT"
+	AC_CHECK_LIB(usb, usb_get_string_simple, [LIBUSB="$LIBUSB -lusb"],
+		[ AC_MSG_ERROR([your libusb is too old. install version 0.1.7 or above]) ])
+	LIBS="$ac_save_LIBS"
+fi
 
 dnl check shat to use for dlopen
 AC_SUBST(LIBDL)