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

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2013-09-05 18:33:55 +0000 (Thu, 05 Sep 2013)
New Revision: 6746

Modified:
   trunk/Drivers/ccid/configure.ac
Log:
Set LIBUSB_* even if the libusb-1.0 version is too old

If PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= $LIBUSB_NEEDED_VERSION,...)
fails then LIBUSB_CFLAGS and LIBUSB_LIBS are not set.
This is problematic since it just displays a warning.
So we recall PKG_CHECK_MODULES(LIBUSB, libusb-1.0) with not version test

Problem discovered with Debian GNU/kFreeBSD where libusb-1.0 is at
version 1.0.6 (it is not the _real_ libusb).

./configure failed with:
[...]
checking for LIBUSB... no
configure: WARNING: install libusb 1.0.8 or later
checking libusb.h usability... yes
checking libusb.h presence... yes
checking for libusb.h... yes
configure: error: libusb not found, use ./configure LIBUSB_LIBS=...


Modified: trunk/Drivers/ccid/configure.ac
===================================================================
--- trunk/Drivers/ccid/configure.ac	2013-09-03 16:28:30 UTC (rev 6745)
+++ trunk/Drivers/ccid/configure.ac	2013-09-05 18:33:55 UTC (rev 6746)
@@ -107,6 +107,7 @@
 	PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= $LIBUSB_NEEDED_VERSION, [],
 		[
 		AC_MSG_WARN([install libusb $LIBUSB_NEEDED_VERSION or later])
+		PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
 		])
 	])