[Pcsclite-cvs-commit] CVS Drivers/ccid

[CVS User rousseau]

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

Modified Files:
	configure.in 
Log Message:
do not check for SCardEstablishContext is the user does NOT want to use
pcsc-lite (with --disable-pcsclite)


--- /cvsroot/pcsclite/Drivers/ccid/configure.in	2005/03/14 18:48:56	1.41
+++ /cvsroot/pcsclite/Drivers/ccid/configure.in	2005/03/17 10:11:14	1.42
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl You may need to use autoconf 2.56 or newer
 
-dnl $Id: configure.in,v 1.41 2005/03/14 18:48:56 rousseau Exp $
+dnl $Id: configure.in,v 1.42 2005/03/17 10:11:14 rousseau Exp $
 
 dnl Require autoconf 2.52
 AC_PREREQ(2.52)
@@ -47,12 +47,6 @@
 	[ #include <ifdhandler.h> ])
 CFLAGS="$OLD_CFLAGS"
 
-OLD_LDLIBS="$LDLIBS"
-LDLIBS="$LDLIBS $PCSC_LIBS"
-AC_CHECK_LIB(pcsclite, SCardEstablishContext, [],
-	[AC_MSG_ERROR([SCardEstablishContext() not found, install pcsc-lite 1.2.9-beta5 or later,or use LDLIBS=... ./configure])])
-LDLIBS="$OLD_LDLIBS"
-
 dnl Add libtool support.
 AM_PROG_LIBTOOL
 
@@ -198,6 +192,13 @@
 	AM_CONDITIONAL(WITHOUT_PCSC, true)
 	AM_CONDITIONAL(NEED_PARSER, true)
 else
+	dnl check that pcsc-lite is installed
+	OLD_LDLIBS="$LDLIBS"
+	LDLIBS="$LDLIBS $PCSC_LIBS"
+	AC_CHECK_LIB(pcsclite, SCardEstablishContext, [],
+		[AC_MSG_ERROR([SCardEstablishContext() not found, install pcsc-lite 1.2.9-beta5 or later,or use LDLIBS=... ./configure])])
+	LDLIBS="$OLD_LDLIBS"
+
 	AM_CONDITIONAL(WITHOUT_PCSC, false)
 fi
 AC_MSG_RESULT([compiled for pcsc-lite  : $pcsclite])