[Pcsclite-cvs-commit] r1733 - in trunk/Drivers/ccid: . src

[Ludovic Rousseau]

Author: rousseau
Date: 2005-11-24 10:06:04 +0000 (Thu, 24 Nov 2005)
New Revision: 1733

Modified:
   trunk/Drivers/ccid/configure.in
   trunk/Drivers/ccid/src/Makefile.am
Log:
use LIBUSB_CFLAGS/LIBUSB_LIBS instead of LDFLAGS/CPPFLAGS for libusb
configuration


Modified: trunk/Drivers/ccid/configure.in
===================================================================
--- trunk/Drivers/ccid/configure.in	2005-11-24 09:14:14 UTC (rev 1732)
+++ trunk/Drivers/ccid/configure.in	2005-11-24 10:06:04 UTC (rev 1733)
@@ -106,31 +106,37 @@
 				use_libusb=false
 				;;
 			*)
-				CPPFLAGS="$CPPFLAGS -I${enableval}/include"
-				LDFLAGS="$LDFLAGS -L${enableval}/lib"
+				LIBUSB_CFLAGS="-I${enableval}/include"
+				LIBUSB_LIBS="-L${enableval}/lib -lusb"
 				;;
 		esac
 	]
 )
 
 dnl check if libusb is available
-if test "${use_libusb}" != false ; then
-	AC_SUBST(LIBUSB)
+if test "x$use_libusb" != xfalse ; then
+	saved_CPPFLAGS="$CPPFLAGS"
+	saved_LIBS="$LIBS"
+
+	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
+	LIBS="$LDFLAGS $LIBUSB_LIBS"
+
 	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_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"
+
+	CPPFLAGS="$saved_LIBS"
+	LIBS="$saved_LIBS"
 fi
+AC_SUBST(LIBUSB_CFLAGS)
+AC_SUBST(LIBUSB_LIBS)
 
 dnl check what to use for dlopen
 AC_SUBST(LIBDL)

Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am	2005-11-24 09:14:14 UTC (rev 1732)
+++ trunk/Drivers/ccid/src/Makefile.am	2005-11-24 10:06:04 UTC (rev 1733)
@@ -41,15 +41,15 @@
 endif
 
 libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1)
-libccid_la_LIBADD = @LIBDL@ @LEXLIB@ @COREFOUNDATION@ @IOKIT@ @LIBUSB@
-libccid_la_CFLAGS = @PCSC_CFLAGS@
+libccid_la_LIBADD = @LIBDL@ @LEXLIB@ @COREFOUNDATION@ @IOKIT@ @LIBUSB_LIBS@
+libccid_la_CFLAGS = @PCSC_CFLAGS@ @LIBUSB_CFLAGS@
 
 libccidtwin_la_SOURCES = $(COMMON) $(SERIAL) $(T1)
 libccidtwin_la_CFLAGS = @PCSC_CFLAGS@ -DTWIN_SERIAL
 
 parse_SOURCES = tokenparser.l parse.c parser.h debug.c
 parse_LDADD = libccid.la
-parse_CFLAGS = @PCSC_CFLAGS@
+parse_CFLAGS = @PCSC_CFLAGS@ @LIBUSB_CFLAGS@
 
 EXTRA_DIST = Info.plist create_Info_plist.pl reader.conf.in \
 	towitoko/COPYING towitoko/README openct/LICENSE