[Pcsclite-cvs-commit] r2005 - in trunk/Drivers/ccid: . src
Ludovic Rousseau
rousseau at costa.debian.org
Tue Apr 18 12:10:35 UTC 2006
Author: rousseau
Date: 2006-04-18 12:10:29 +0000 (Tue, 18 Apr 2006)
New Revision: 2005
Modified:
trunk/Drivers/ccid/configure.in
trunk/Drivers/ccid/src/Makefile.am
Log:
always use our own tokenparser.l even when pcsc-lite is used (do not use
LTPBundleFindValueWithKey from pcscd)
Modified: trunk/Drivers/ccid/configure.in
===================================================================
--- trunk/Drivers/ccid/configure.in 2006-04-14 18:46:46 UTC (rev 2004)
+++ trunk/Drivers/ccid/configure.in 2006-04-18 12:10:29 UTC (rev 2005)
@@ -210,7 +210,6 @@
if test "${pcsclite}" = no ; then
AM_CONDITIONAL(WITHOUT_PCSC, true)
- AM_CONDITIONAL(NEED_PARSER, true)
else
# check that pcsc-lite is installed
OLD_LIBS="$LIBS"
@@ -220,7 +219,6 @@
LIBS="$OLD_LIBS"
AM_CONDITIONAL(WITHOUT_PCSC, false)
- AM_CONDITIONAL(NEED_PARSER, false)
pcsclite=yes
fi
Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am 2006-04-14 18:46:46 UTC (rev 2004)
+++ trunk/Drivers/ccid/src/Makefile.am 2006-04-18 12:10:29 UTC (rev 2005)
@@ -30,12 +30,8 @@
openct/checksum.h \
openct/proto-t1.c \
openct/proto-t1.h
+TOKEN_PARSER = tokenparser.l parser.h
-# needed when used without pcsc-lite (Solaris)
-if NEED_PARSER
-TOKEN_PARSER = tokenparser_fake.l
-endif
-
if WITHOUT_PCSC
PROVIDED_BY_PCSC = debug.c
endif
@@ -49,16 +45,13 @@
libccidtwin_la_CFLAGS = $(PCSC_CFLAGS) $(PTHREAD_CFLAGS) -DTWIN_SERIAL
libccidtwin_la_LIBADD = $(PTHREAD_LIBS)
-parse_SOURCES = tokenparser.l parse.c parser.h debug.c
+parse_SOURCES = parse.c debug.c
parse_LDADD = libccid.la
parse_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS)
EXTRA_DIST = Info.plist create_Info_plist.pl reader.conf.in \
towitoko/COPYING towitoko/README openct/LICENSE
-tokenparser_fake.l: tokenparser.l
- cp -f $^ $@
-
# do not install the serial driver by default
# use explicitely 'make install_ccidtwin'
install: install_ccid
More information about the Pcsclite-cvs-commit
mailing list