[Pcsclite-cvs-commit] Drivers/ccid INSTALL,1.8,1.9 configure.in,1.16,1.17

rousseau@haydn.debian.org rousseau@haydn.debian.org


Update of /cvsroot/pcsclite/Drivers/ccid
In directory haydn:/tmp/cvs-serv12342

Modified Files:
	INSTALL configure.in 
Log Message:
use `pkg-config libpcsclite --variable=usbdropdir` so you do not have to
use --enable-usbdropdir=DIR or --enable-ccidtwindir=DIR even if pcscd
does not use the default /usr/local/pcsc/drivers


Index: INSTALL
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/INSTALL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- INSTALL	12 May 2004 12:09:09 -0000	1.8
+++ INSTALL	14 May 2004 09:07:29 -0000	1.9
@@ -8,15 +8,14 @@
 
 $ tar xzvf ccid-x.y.z.tar.gz
 $ cd ccid-x.y.z
-$ dropdir=$(pkg-config libpcsclite --variable=usbdropdir)
-$ ./configure --enable-usbdropdir=$dropdir
+$ ./configure
 $ make
 $ sudo make install
 
 By default pcscd and my ccid driver use /usr/local/pcsc/drivers/ as
-directory for hotplug drivers. But pcscd store this value in a
-pkg-config file so you do not have to know where the files are searched
-for.
+directory for hotplug drivers. The ./configure script try to get the
+directory used by pcscd using 'pkg-config libpcsclite --variable=usbdropdir'
+So you should not have to use the --enable-usbdropdir=DIR argument.
 
 
 libusb not found
@@ -35,8 +34,7 @@
 The GemPCTwin reader can also be connected on a serial port. By default
 the serial driver is built but not installed. You must explicitely do:
 
-$ dropdir=$(pkg-config libpcsclite --variable=usbdropdir)
-$ ./configure --enable-ccidtwindir=$dropdir/serial
+$ ./configure
 $ make -C src install_ccidtwin
 
 
@@ -49,9 +47,10 @@
 $ ./configure --disable-libusb
 $ cd src ; make libccidtwin.la ; sudo make install_ccidtwin
 
-You can use --enable-ccidtwindir=DIR to specify the target directory to
-use. The default is $(prefix)/pcsc/drivers/serial with $(prefix) default
-value /usr/local.
+By default ./configure try to get the directory used by pcscd using
+'pkg-config libpcsclite --variable=usbdropdir' and add '/serial'.
+You should not have to use --enable-ccidtwindir=DIR to specify the
+target directory to use. 
 
 
 configuring the driver for the serial reader (GemPC Twin)

Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.in	6 Apr 2004 13:32:54 -0000	1.16
+++ configure.in	14 May 2004 09:07:29 -0000	1.17
@@ -149,11 +149,14 @@
 dnl --enable-usbdropdir=DIR
 AC_ARG_ENABLE(usbdropdir,
 	AC_HELP_STRING([--enable-usbdropdir=DIR],[directory containing USB
-	drivers (default $(prefix)/pcsc/drivers)]),
+	drivers (default to pcscd config or $(prefix)/pcsc/drivers)]),
 	[usbdropdir="${enableval}"], [usbdropdir=false])
 if test "${usbdropdir}" = false ; then
 	if test "$prefix" = NONE ; then
-		usbdropdir="$ac_default_prefix/pcsc/drivers"
+		usbdropdir=`pkg-config libpcsclite --variable=usbdropdir`
+		if test -z "$usbdropdir" ; then
+			usbdropdir="$ac_default_prefix/pcsc/drivers"
+		fi
 	else
 		usbdropdir="$prefix/pcsc/drivers"
 	fi
@@ -164,11 +167,15 @@
 dnl --enable-ccidtwindir=DIR
 AC_ARG_ENABLE(ccidtwindir,
 	AC_HELP_STRING([--enable-ccidtwindir=DIR],[directory to install the
-	serial Twin driver (default $(prefix)/pcsc/drivers/serial)]),
+	serial Twin driver (default to pcscd config or $(prefix)/pcsc/drivers/serial)]),
 	[ccidtwindir="${enableval}"], [ccidtwindir=false])
 if test "${ccidtwindir}" = false ; then
 	if test "$prefix" = NONE ; then
-		ccidtwindir="$ac_default_prefix/pcsc/drivers/serial"
+		ccidtwindir=`pkg-config libpcsclite --variable=usbdropdir`
+		if test -z "$ccidtwindir" ; then
+			ccidtwindir="$ac_default_prefix/pcsc/drivers"
+		fi
+		ccidtwindir="$ccidtwindir/serial"
 	else
 		ccidtwindir="$prefix/pcsc/drivers/serial"
 	fi