[Pcsclite-cvs-commit] r1732 - in trunk/PCSC: . src

[Ludovic Rousseau]

Author: rousseau
Date: 2005-11-24 09:14:14 +0000 (Thu, 24 Nov 2005)
New Revision: 1732

Modified:
   trunk/PCSC/configure.in
   trunk/PCSC/src/Makefile.am
Log:
we need to provide LTPBundleFindValueWithKey for all plateforms. This
function is NOT provided by Mac OS X. The bug I wanted to correct
yesterday is in the CCID driver instead.
patch reverted.


Modified: trunk/PCSC/configure.in
===================================================================
--- trunk/PCSC/configure.in	2005-11-24 08:52:18 UTC (rev 1731)
+++ trunk/PCSC/configure.in	2005-11-24 09:14:14 UTC (rev 1732)
@@ -123,10 +123,6 @@
 AC_DEFINE_UNQUOTED(PCSC_ARCH, "$uname", [PC/SC target architecture])
 AC_DEFINE_UNQUOTED(MSC_ARCH, "$uname", [MuscleCard target architecture])
 
-# we need tokenparser.l (LTPBundleFindValueWithKey) only on non Mac OS X
-# plateforms
-AM_CONDITIONAL(NEED_TOKENPARSER, test "x$uname" != "xMacOS")
-
 # See if socket() is found from libsocket
 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
 

Modified: trunk/PCSC/src/Makefile.am
===================================================================
--- trunk/PCSC/src/Makefile.am	2005-11-24 08:52:18 UTC (rev 1731)
+++ trunk/PCSC/src/Makefile.am	2005-11-24 09:14:14 UTC (rev 1732)
@@ -25,10 +25,6 @@
 PCSC_CLIENT_SRC  = winscard_clnt.c
 endif
 
-if NEED_TOKENPARSER
-TOKENPARSER = tokenparser.l
-endif
-
 libpcsclite_core_la_SOURCES = \
 	atrhandler.c \
 	configfile.l \
@@ -36,7 +32,7 @@
 	ifdwrapper.c \
 	prothandler.c \
 	readerfactory.c \
-	$(TOKENPARSER) \
+	tokenparser.l \
 	winscard.c \
 	winscard_msg.c \
 	$(PCSC_SYSTEM_SRC) \
@@ -50,7 +46,7 @@
 libpcsclite_la_SOURCES = \
 	debuglog.c \
 	winscard_msg.c \
-	$(TOKENPARSER) \
+	tokenparser.l \
 	$(PCSC_CLIENT_SRC) \
 	$(PCSC_SYSTEM_SRC) \
 	$(PCSC_THREAD_SRC) \