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

[Ludovic Rousseau]

Author: rousseau
Date: 2006-08-11 17:15:28 +0000 (Fri, 11 Aug 2006)
New Revision: 2134

Modified:
   trunk/Drivers/ccid/configure.in
   trunk/Drivers/ccid/src/Makefile.am
Log:
use ./configure --enable-twinserial to compile and install the the
driver for the GemPC Twin serial

Thanks to Wolfgang Glas for the idea


Modified: trunk/Drivers/ccid/configure.in
===================================================================
--- trunk/Drivers/ccid/configure.in	2006-08-11 16:10:28 UTC (rev 2133)
+++ trunk/Drivers/ccid/configure.in	2006-08-11 17:15:28 UTC (rev 2134)
@@ -208,6 +208,17 @@
 	AC_MSG_ERROR([use --enable-usbdropdir=DIR])
 fi
 
+# --enable-twinserial
+AC_ARG_ENABLE(twinserial,
+	AC_HELP_STRING([--enable-twinserial],[also compile and install the serial Twin driver]),
+	[twinserial="${enableval}"], [twinserial=false])
+AC_MSG_RESULT([build and install serial Twin driver : $twinserial])
+if test "${twinserial}" = false ; then
+	AM_CONDITIONAL(WITH_TWIN_SERIAL, false)
+else
+	AM_CONDITIONAL(WITH_TWIN_SERIAL, true)
+fi
+
 # --enable-ccidtwindir=DIR
 AC_ARG_ENABLE(ccidtwindir,
 	AC_HELP_STRING([--enable-ccidtwindir=DIR],[directory to install the

Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am	2006-08-11 16:10:28 UTC (rev 2133)
+++ trunk/Drivers/ccid/src/Makefile.am	2006-08-11 17:15:28 UTC (rev 2134)
@@ -4,7 +4,12 @@
 CCID_LIB = libccid.$(DYN_LIB_EXT)
 CCIDTWIN_LIB = libccidtwin.$(DYN_LIB_EXT)
 
-lib_LTLIBRARIES = libccid.la libccidtwin.la
+lib_LTLIBRARIES = libccid.la
+LIBS_TO_INSTALL = install_ccid
+if WITH_TWIN_SERIAL
+lib_LTLIBRARIES += libccidtwin.la
+LIBS_TO_INSTALL += install_ccidtwin
+endif
 bin_PROGRAMS = parse
 
 COMMON = ccid.c \
@@ -58,9 +63,7 @@
 EXTRA_DIST = Info.plist create_Info_plist.pl reader.conf.in \
 	towitoko/COPYING towitoko/README openct/LICENSE
 
-# do not install the serial driver by default
-# use explicitely 'make install_ccidtwin'
-install: install_ccid
+install: $(LIBS_TO_INSTALL)
 
 install_ccid: libccid.la
 	$(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/