[Pcsclite-cvs-commit] CVS libmusclecard

CVS User rousseau ludovic.rousseau@free.fr
Tue, 22 Feb 2005 08:31:09 -0700


Update of /cvsroot/pcsclite/libmusclecard
In directory haydn:/tmp/cvs-serv25706

Modified Files:
	configure.in 
Log Message:
test the pcsc-lite version directly by PKG_CHECK_MODULES
add a test on winscard.h header and on pcsclite library


--- /cvsroot/pcsclite/libmusclecard/configure.in	2005/02/21 11:52:57	1.2
+++ /cvsroot/pcsclite/libmusclecard/configure.in	2005/02/22 15:31:09	1.3
@@ -34,14 +34,21 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS(closedir fgets strlen memcpy opendir)
 AC_CHECK_FUNCS(readdir sprintf strcmp strstr)
-PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PKG_CONFIG_PATH
-PKG_CHECK_MODULES(PCSCLITE, libpcsclite)
-if ! `pkg-config --print-errors --atleast-version=1.2.9-beta7 libpcsclite`
-then
-	AC_MSG_ERROR([install pcsc-lite 1.2.9-beta7 or later])
-fi
+PKG_CHECK_MODULES(PCSC, libpcsclite >= 1.2.9-beta7, [],
+	AC_MSG_WARN([install pcsc-lite 1.2.9-beta7 or later]))
 
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $PCSC_CFLAGS"
+AC_CHECK_HEADER(winscard.h, [],
+	[AC_MSG_ERROR([winscard.h not found, install pcsc-lite 1.2.9-beta7 or later, or use CFLAGS=... ./configure])],
+	[ #include <winscard.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-beta7 or later])])
+LDLIBS="$OLD_LDLIBS"
 
 dnl special check for pthread support
 ACX_PTHREAD(