[Pcsclite-cvs-commit] r1784 - trunk/Drivers/ccid

[Ludovic Rousseau]

Author: rousseau
Date: 2006-01-02 08:25:22 +0000 (Mon, 02 Jan 2006)
New Revision: 1784

Modified:
   trunk/Drivers/ccid/configure.in
Log:
use pkg-config for libusb if available


Modified: trunk/Drivers/ccid/configure.in
===================================================================
--- trunk/Drivers/ccid/configure.in	2005-12-15 13:53:16 UTC (rev 1783)
+++ trunk/Drivers/ccid/configure.in	2006-01-02 08:25:22 UTC (rev 1784)
@@ -100,14 +100,18 @@
 
 # check if libusb is used
 if test "x$use_libusb" != xno ; then
-	AC_CHECK_PROG([LIBUSBCONFIG], [libusb-config], [yes])
+	PKG_CHECK_MODULES(LIBUSB, libusb, [],
+		[
+			AC_MSG_RESULT([no])
+			AC_CHECK_PROG([LIBUSBCONFIG], [libusb-config], [yes])
 
-	if test "$LIBUSBCONFIG" = "yes" ; then
-		LIBUSB_CFLAGS="$LIBUSB_CFLAGS `libusb-config --cflags`"
-		LIBUSB_LIBS="$LIBUSB_LIBS `libusb-config --libs`"
-	else
-		AC_MSG_WARN([libusb-config not found.])
-	fi
+			if test "$LIBUSBCONFIG" = "yes" ; then
+				LIBUSB_CFLAGS="$LIBUSB_CFLAGS `libusb-config --cflags`"
+				LIBUSB_LIBS="$LIBUSB_LIBS `libusb-config --libs`"
+			else
+				AC_MSG_WARN([libusb-config not found.])
+			fi
+		])
 
 	saved_CPPFLAGS="$CPPFLAGS"
 	saved_LIBS="$LIBS"