[Pcsclite-cvs-commit] r4486 - in /trunk/PCSC: configure.in src/Makefile.am src/winscard_scf.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Oct 13 06:47:04 2009
New Revision: 4486

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4486
Log:
remove SCF support (PC/SC over Smart Card Framework).
I never used this feature and SCF is now dead and replaced by JSR 268
(javax.smartcardio)

Removed:
    trunk/PCSC/src/winscard_scf.c
Modified:
    trunk/PCSC/configure.in
    trunk/PCSC/src/Makefile.am

Modified: trunk/PCSC/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/configure.in?rev=4486&op=diff
==============================================================================
--- trunk/PCSC/configure.in (original)
+++ trunk/PCSC/configure.in Tue Oct 13 06:47:04 2009
@@ -264,23 +264,6 @@
   PCSCLITE_FEATURES="${PCSCLITE_FEATURES} debugatr"
 fi
 
-# --enable-scf
-AC_ARG_ENABLE(scf,
-  AC_HELP_STRING([--enable-scf],[use SCF for reader support]),
-[ case "${enableval}" in
-  yes)	scf=true ;;
-  no)	scf=false ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for --enable-scf]) ;;
-esac], [scf=false])
-
-AC_SUBST(LIBSMARTCARD)
-if test x$scf = xtrue -a x$ac_cv_header_smartcard_scf_h = xyes; then
-  AC_CHECK_LIB(smartcard, SCF_strerror, [LIBSMARTCARD="$LIBSMARTCARD -lsmartcard" scf=true], scf=false)
-else
-  scf=false
-fi
-AM_CONDITIONAL(HAVE_SCF, test x$scf = xtrue)
-
 # --enable-confdir=DIR
 AC_ARG_ENABLE(confdir,
 AC_HELP_STRING([--enable-confdir=DIR],[directory containing reader.conf
@@ -352,7 +335,6 @@
 
 libhal support:       ${use_libhal}
 libusb support:       ${use_libusb}
-SCF reader support:   ${scf}
 USB drop directory:   ${usbdropdir}
 ATR parsing messages: ${debugatr}
 confdir:              ${confdir}

Modified: trunk/PCSC/src/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/Makefile.am?rev=4486&op=diff
==============================================================================
--- trunk/PCSC/src/Makefile.am (original)
+++ trunk/PCSC/src/Makefile.am Tue Oct 13 06:47:04 2009
@@ -5,16 +5,10 @@
 
 lib_LTLIBRARIES = libpcsclite.la
 
-if !HAVE_SCF
 sbin_PROGRAMS = pcscd
-endif
 noinst_PROGRAMS = testpcsc pcsc-wirecheck pcsc-wirecheck-gen
 
-if HAVE_SCF
-PCSC_CLIENT_SRC  = winscard_scf.c
-else
 PCSC_CLIENT_SRC  = winscard_clnt.c
-endif
 
 libpcsclite_la_SOURCES = \
 	debug.c \
@@ -151,5 +145,5 @@
 tokenparser.c: tokenparser.l
 	$(SHELL) $(YLWRAP) $< lex.tp.c $@ -- "$(LEX)" -Ptp $(AM_LFLAGS) $(LFLAGS)
 
-EXTRA_DIST = README_INTERNALS.txt winscard_scf.c
+EXTRA_DIST = README_INTERNALS.txt