[Pcsclite-cvs-commit] Drivers/ccid configure.in,1.18,1.19 config.h.in,1.4,1.5

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


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

Modified Files:
	configure.in config.h.in 
Log Message:
check for pcsclite.h and ifdhandler.h installed by recent pcsc-lite


Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure.in	14 May 2004 14:14:38 -0000	1.18
+++ configure.in	17 May 2004 14:32:56 -0000	1.19
@@ -32,11 +32,6 @@
 AM_PROG_LEX
 AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
 
-AC_CHECK_FUNCS(strerror)
-AC_CHECK_FUNCS(strncpy)
-
-AC_CHECK_HEADERS(errno.h)
-
 dnl Add libtool support.
 AM_PROG_LIBTOOL
 
@@ -45,7 +40,16 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h stdlib.h unistd.h termios.h string.h errno.h sys/time.h sys/types.h stdarg.h)
+AC_CHECK_HEADERS(errno.h fcntl.h stdlib.h unistd.h termios.h string.h errno.h sys/time.h sys/types.h stdarg.h,,
+	[AC_MSG_WARN([some header files not found])])
+
+AC_CHECK_HEADERS(pcsclite.h,,
+	[AC_MSG_ERROR([pcsclite.h not found, install pcsc-lite])])
+
+AC_CHECK_HEADERS(ifdhandler.h,,
+	[AC_MSG_ERROR([ifdhandler.h not found, install pcsc-lite 1.2.9-beta3 or later])],
+	[ #include <pcsclite.h> ])
+
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

Index: config.h.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h.in	6 Apr 2004 13:32:54 -0000	1.4
+++ config.h.in	17 May 2004 14:32:56 -0000	1.5
@@ -12,6 +12,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the <ifdhandler.h> header file. */
+#undef HAVE_IFDHANDLER_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -20,6 +23,9 @@
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <pcsclite.h> header file. */
+#undef HAVE_PCSCLITE_H
 
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD