[Pcsclite-cvs-commit] r5318 - in /trunk/Drivers/ccid: configure.in src/Info.plist.src src/Makefile.am src/create_Info_plist.pl

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Oct 14 09:39:35 2010
New Revision: 5318

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5318
Log:
Remove --enable-udev option since it is not used anymore with libhal.
The udev rules file is now used to change the access rights of the
device and not send a hotplug signal to pcscd.

Modified:
    trunk/Drivers/ccid/configure.in
    trunk/Drivers/ccid/src/Info.plist.src
    trunk/Drivers/ccid/src/Makefile.am
    trunk/Drivers/ccid/src/create_Info_plist.pl

Modified: trunk/Drivers/ccid/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/configure.in?rev=5318&op=diff
==============================================================================
--- trunk/Drivers/ccid/configure.in (original)
+++ trunk/Drivers/ccid/configure.in Thu Oct 14 09:39:35 2010
@@ -243,12 +243,6 @@
 fi
 AM_CONDITIONAL(WITHOUT_PCSC, test "${pcsclite}" != "yes")
 
-# --enable-udev
-AC_ARG_ENABLE(udev,
-	AC_HELP_STRING([--enable-udev],[udev support for pcscd hotplug]),
-	[udev="${enableval}"], [udev=no])
-AM_CONDITIONAL(UDEV, test "${udev}" != "no")
-
 # --disable-class
 AC_ARG_ENABLE(class,
 	AC_HELP_STRING([--disable-class],[remove the CCIDCLASSDRIVER from Info.plist]),
@@ -311,7 +305,6 @@
 serial Twin support:     ${twinserial}
 serial twin install dir: ${ccidtwindir}
 compiled for pcsc-lite:  ${pcsclite}
-udev support:            ${udev}
 class driver:            ${class}
 
 EOF

Modified: trunk/Drivers/ccid/src/Info.plist.src
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Info.plist.src?rev=5318&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Info.plist.src (original)
+++ trunk/Drivers/ccid/src/Info.plist.src Thu Oct 14 09:39:35 2010
@@ -20,7 +20,7 @@
 	<key>CFBundleVersion</key>
 	<string>0.0.1d1</string>
 	<key>ifdCapabilities</key>
-	<string>MAGIC_IFDCAPABILITIES</string>
+	<string>0x00000000</string>
 
 	<!-- Possible values for ifdCapabilities bits
 	1: IFD_GENERATE_HOTPLUG

Modified: trunk/Drivers/ccid/src/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Makefile.am?rev=5318&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Makefile.am (original)
+++ trunk/Drivers/ccid/src/Makefile.am Thu Oct 14 09:39:35 2010
@@ -73,15 +73,10 @@
 
 install: $(LIBS_TO_INSTALL)
 
-if UDEV
-ifdCapabilities=0x00000001
 INSTALL_UDEV_RULE_FILE=@echo -e "\n\33[01;31m***************\n" ; echo "copy the src/pcscd_ccid.rules file in udev directory (/etc/udev/rules.d/)" ; echo -e "\n***************\n\33[0m"
-else
-ifdCapabilities=0x00000000
-endif
 
 Info.plist: Info.plist.src $(srcdir)/../readers/supported_readers.txt
-	$(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --ifdCapabilities=$(ifdCapabilities) --target=$(CCID_LIB) --version=$(VERSION) --bundle=$(CCID_BUNDLE) $(NOCLASS) > Info.plist
+	$(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) --bundle=$(CCID_BUNDLE) $(NOCLASS) > Info.plist
 	
 DISTCLEANFILES = tokenparser.c Info.plist
 

Modified: trunk/Drivers/ccid/src/create_Info_plist.pl
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/create_Info_plist.pl?rev=5318&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/create_Info_plist.pl (original)
+++ trunk/Drivers/ccid/src/create_Info_plist.pl Thu Oct 14 09:39:35 2010
@@ -26,7 +26,6 @@
 
 my (@manuf, @product, @name);
 my ($manuf, $product, $name);
-my $ifdCapabilities = "0x00000000";
 my $target = "libccid.so";
 my $version = "1.0.0";
 my $bundle = "ifd-ccid.bundle";
@@ -34,7 +33,7 @@
 	<string>CCIDCLASSDRIVER</string>";
 my $noclass = 0;
 
-GetOptions("ifdCapabilities=s" => \$ifdCapabilities,
+GetOptions(
 	"target=s" => \$target,
 	"version=s" => \$version,
 	"bundle=s" => \$bundle,
@@ -43,7 +42,6 @@
 if ($#ARGV < 1)
 {
 	print "usage: $0 supported_readers.txt Info.plist
-	--ifdCapabilities=$ifdCapabilities
 	--target=$target
 	--version=$version
 	--bundle=$bundle\n";
@@ -88,12 +86,6 @@
 		print @name;
 		next;
 	}
-	if (m/MAGIC_IFDCAPABILITIES/)
-	{
-		s/MAGIC_IFDCAPABILITIES/$ifdCapabilities/;
-		print;
-		next;
-	}
 	if (m/MAGIC_TARGET/)
 	{
 		s/MAGIC_TARGET/$target/;