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

[Ludovic Rousseau]

Author: rousseau
Date: 2005-11-21 15:58:59 +0000 (Mon, 21 Nov 2005)
New Revision: 1727

Modified:
   trunk/PCSC/configure.in
   trunk/PCSC/src/Makefile.am
Log:
we need tokenparser.l (LTPBundleFindValueWithKey) only on non Mac OS X
plateforms. So we avoid linking with tokenparser.o and a possible
"multiple definitions of symbol _LTPBundleFindValueWithKey" ldd error


Modified: trunk/PCSC/configure.in
===================================================================
--- trunk/PCSC/configure.in	2005-11-21 15:25:23 UTC (rev 1726)
+++ trunk/PCSC/configure.in	2005-11-21 15:58:59 UTC (rev 1727)
@@ -123,6 +123,10 @@
 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")
+
 dnl 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-21 15:25:23 UTC (rev 1726)
+++ trunk/PCSC/src/Makefile.am	2005-11-21 15:58:59 UTC (rev 1727)
@@ -25,6 +25,10 @@
 PCSC_CLIENT_SRC  = winscard_clnt.c
 endif
 
+if NEED_TOKENPARSER
+TOKENPARSER = tokenparser.l
+endif
+
 libpcsclite_core_la_SOURCES = \
 	atrhandler.c \
 	configfile.l \
@@ -32,7 +36,7 @@
 	ifdwrapper.c \
 	prothandler.c \
 	readerfactory.c \
-	tokenparser.l \
+	$(TOKENPARSER) \
 	winscard.c \
 	winscard_msg.c \
 	$(PCSC_SYSTEM_SRC) \
@@ -46,7 +50,7 @@
 libpcsclite_la_SOURCES = \
 	debuglog.c \
 	winscard_msg.c \
-	tokenparser.l \
+	$(TOKENPARSER) \
 	$(PCSC_CLIENT_SRC) \
 	$(PCSC_SYSTEM_SRC) \
 	$(PCSC_THREAD_SRC) \