[Pcsclite-cvs-commit] Drivers/ccid configure.in,1.21,1.22

[rousseau@haydn.debian.org]

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

Modified Files:
	configure.in 
Log Message:
use 'pkg-config libpcsclite --variable=usbdropdir' even if --prefix= is
used. You should use --enable-usbdropdir= and --enable-ccidtwindir= to
set to different values.


Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.in	25 May 2004 08:25:23 -0000	1.21
+++ configure.in	30 May 2004 19:45:30 -0000	1.22
@@ -157,17 +157,17 @@
 	drivers (default to pcscd config or $(prefix)/pcsc/drivers)]),
 	[usbdropdir="${enableval}"], [usbdropdir=false])
 if test "${usbdropdir}" = false ; then
-	if test "$prefix" = NONE ; then
-		if test "$PKGCONFIG" = yes ; then
-			usbdropdir=`pkg-config libpcsclite --variable=usbdropdir`
-		else
-			usbdropdir=""
-		fi
-		if test -z "$usbdropdir" ; then
+	if test "$PKGCONFIG" = yes ; then
+		usbdropdir=`pkg-config libpcsclite --variable=usbdropdir`
+	else
+		usbdropdir=""
+	fi
+	if test -z "$usbdropdir" ; then
+		if test "$prefix" = NONE ; then
 			usbdropdir="$ac_default_prefix/pcsc/drivers"
+		else
+			usbdropdir="$prefix/pcsc/drivers"
 		fi
-	else
-		usbdropdir="$prefix/pcsc/drivers"
 	fi
 fi
 AC_MSG_RESULT([USB drop directory      : $usbdropdir])
@@ -179,20 +179,20 @@
 	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
-		if test "$PKGCONFIG" = yes ; then
-			ccidtwindir=`pkg-config libpcsclite --variable=usbdropdir`
-		else
-			AC_MSG_RESULT([You should install pkg-config to get this configured automatically from pcsc-lite installation])
-			ccidtwindir=""
-		fi
-		if test -z "$ccidtwindir" ; then
+	if test "$PKGCONFIG" = yes ; then
+		ccidtwindir=`pkg-config libpcsclite --variable=usbdropdir`
+	else
+		AC_MSG_RESULT([You should install pkg-config to get this configured automatically from pcsc-lite installation])
+		ccidtwindir=""
+	fi
+	if test -z "$ccidtwindir" ; then
+		if test "$prefix" = NONE ; then
 			ccidtwindir="$ac_default_prefix/pcsc/drivers"
+		else
+			ccidtwindir="$prefix/pcsc/drivers"
 		fi
-		ccidtwindir="$ccidtwindir/serial"
-	else
-		ccidtwindir="$prefix/pcsc/drivers/serial"
 	fi
+	ccidtwindir="$ccidtwindir/serial"
 fi
 AC_MSG_RESULT([serial twin install dir : $ccidtwindir])
 AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$ccidtwindir", [directory containing USB drivers])