[Pcsclite-cvs-commit] CVS PKCS11

[CVS User rousseau]

Update of /cvsroot/muscleapps/PKCS11
In directory haydn:/tmp/cvs-serv15793

Modified Files:
	configure.in 
Log Message:
use PKG_CHECK_MODULES() to check the availability of libmusclecard


--- /cvsroot/muscleapps/PKCS11/configure.in	2003/12/19 21:10:21	1.6
+++ /cvsroot/muscleapps/PKCS11/configure.in	2005/04/27 15:04:21	1.7
@@ -15,10 +15,34 @@
 AC_PROG_MAKE_SET
 AM_PROG_LIBTOOL
 
+AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
+
+dnl check libmusclecard
+OLD_LIBS="$LIBS"
+PKG_CHECK_MODULES(MUSCLECARD, libmusclecard, [],
+	[ if test -f /usr/local/lib/pkgconfig/libmusclecard.pc ; then
+		AC_MSG_ERROR([use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure])
+	  else
+		AC_MSG_WARN([install libmusclecard])
+	  fi
+	])
+LIBS="$OLD_LIBS"
+
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $MUSCLECARD_CFLAGS"
+AC_CHECK_HEADER(musclecard.h,,
+	[AC_MSG_ERROR([musclecard.h not found, install libmusclecard (included in pcsc-lite), or use CFLAGS=... ./configure])],
+	[ #include <ifdhandler.h> ])
+CFLAGS="$OLD_CFLAGS"
+
+OLD_LIBS="$LIBS"
+LDLIBS="$LDLIBS $MUSCLECARD_LIBS"
+AC_CHECK_LIB(musclecard, MSCListTokens, [],
+	[AC_MSG_ERROR([MSCListTokens() not found, install libmusclecard (included in pcsc-lite), or use LDLIBS=... ./configure])])
+LIBS="$OLD_LIBS"
+
 dnl Checks for libraries.
 AC_CHECK_LIB(crypto, d2i_X509_bio)
-AC_CHECK_LIB(pcsclite, DYN_LoadLibrary)
-AC_CHECK_LIB(musclecard, MSCListTokens)
 AC_CHECK_LIB(pthread, pthread_create)
 
 dnl Checks for header files.