[Pcsclite-cvs-commit] r1880 - trunk/PCSC

[Ludovic Rousseau]

Author: rousseau
Date: 2006-02-23 07:26:41 +0000 (Thu, 23 Feb 2006)
New Revision: 1880

Modified:
   trunk/PCSC/configure.in
Log:
correctly detect the use of --enable-libusb (--enable-libusb has the
same effect as --disable-libusb)

Thanks to Iain MacDonnell for the bug report


Modified: trunk/PCSC/configure.in
===================================================================
--- trunk/PCSC/configure.in	2006-02-22 09:25:57 UTC (rev 1879)
+++ trunk/PCSC/configure.in	2006-02-23 07:26:41 UTC (rev 1880)
@@ -138,7 +138,7 @@
 # --enable-libusb
 AC_ARG_ENABLE(libusb,
 	AC_HELP_STRING([--enable-libusb],[use libusb (default=yes)]),
-	[ use_libusb=no ], [ use_libusb=yes ] )
+	[ use_libusb="${enableval}" ], [ use_libusb=yes ] )
 
 # check if libusb is used
 if test "x$use_libusb" != xno ; then
@@ -174,6 +174,9 @@
 	AC_TRY_LINK_FUNC(usb_get_string_simple, [ AC_MSG_RESULT([yes]) ],
 		[ AC_MSG_ERROR([your libusb is too old. install version 0.1.7 or above]) ])
 
+	# everything needed for libusb support is present
+	use_libusb=yes
+
 	CPPFLAGS="$saved_CPPFLAGS"
 	LIBS="$saved_LIBS"
 fi
@@ -181,7 +184,7 @@
 AC_SUBST(LIBUSB_LIBS)
 
 if test x$use_libusb = xyes; then
-  AC_DEFINE(HAVE_LIBUSB,1, [Libusb is available])
+  AC_DEFINE(HAVE_LIBUSB, 1, [Libusb is available])
 fi
 AC_MSG_RESULT([enable libusb support         : $use_libusb])