[Pcsclite-cvs-commit] PCSC configure.in,1.39,1.40

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC
In directory quantz:/tmp/cvs-serv11664

Modified Files:
	configure.in 
Log Message:
--enable-libusb was not working correctly is the lib is not installed in
/usr or /usr/local


Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	19 Sep 2003 12:36:23 -0000	1.39
+++ configure.in	23 Sep 2003 16:39:38 -0000	1.40
@@ -136,11 +136,7 @@
 AC_SUBST(LIBFL)
 AC_CHECK_LIB(l, yywrap, [LIBFL="$LIBFL -ll"], AC_CHECK_LIB(fl, yywrap, [LIBFL="$LIBFL -lfl"]))
 
-dnl check if libusb is available
 AC_SUBST(LIBUSB)
-AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb" use_libusb=true ], [ use_libusb=false ])
-AC_CHECK_HEADERS(usb.h, [ use_libusb=true ], [ use_libusb=false ])
-
 dnl --enable-libusb=DIR
 AC_ARG_ENABLE(libusb,
   AC_HELP_STRING([--enable-libusb=PATH],[enable USB hotplug using libusb]),
@@ -164,6 +160,13 @@
 		esac
 	]
 )
+
+dnl if use_libusb is not yet defined
+if test x$use_libusb = x; then
+	dnl check if libusb is available
+	AC_CHECK_HEADERS(usb.h, [ use_libusb=true ], [ use_libusb=false ])
+	AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb" use_libusb=true ], [ use_libusb=false ])
+fi
 
 AC_MSG_RESULT([enable libusb support         : $use_libusb])