[Pcsclite-cvs-commit] Drivers/ccid config.h.in,1.1,1.2 configure.in,1.6,1.7

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid
In directory quantz:/tmp/cvs-serv19043

Modified Files:
	config.h.in configure.in 
Log Message:
add --enable-multi-thread for thread safe support


Index: config.h.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/config.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.h.in	10 Sep 2003 09:19:05 -0000	1.1
+++ config.h.in	22 Sep 2003 14:21:57 -0000	1.2
@@ -33,6 +33,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 

Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.in	16 Sep 2003 16:51:02 -0000	1.6
+++ configure.in	22 Sep 2003 14:21:57 -0000	1.7
@@ -82,7 +82,8 @@
 CFLAGS="$CFLAGS -Wall -fno-common"
 
 dnl --enable-libusb=PATH
-AC_ARG_ENABLE(libusb, [  --enable-libusb=PATH    libusb path (default /usr)],
+AC_ARG_ENABLE(libusb,
+	AC_HELP_STRING([--enable-libusb=PATH],[libusb path (default /usr)]),
 	[
 		case ${enableval} in
 			"" | "yes" | "YES")
@@ -113,10 +114,24 @@
 AC_SUBST(LIBDL)
 AC_CHECK_LIB(dl, dlopen, [LIBDL="$LIBDL -ldl" ac_cv_func_dlopen_ldl=yes], ac_cv_func_dlopen_ldl=no)
 
+dnl --enable-multi-thread
+AC_ARG_ENABLE(multi-thread,
+	AC_HELP_STRING([--enable-multi-thread],[enable multi threading
+	(default=yes)]),
+	[ multithread="${enableval}" ], [ multithread=yes ] )
+
+if test "${multithread}" != no ; then
+	AC_CHECK_HEADERS(pthread.h, [], [ AC_MSG_ERROR([pthread.h not found]) ])
+	AC_CHECK_LIB(pthread, pthread_mutex_lock, [ LIBS="$LIBS -lpthread" ],
+		[ multithread=no ])
+fi
+AC_MSG_RESULT([multi threading         : $multithread])
+
 dnl --enable-bundle=NAME
 AC_ARG_ENABLE(bundle,
-[  --enable-bundle=NAME    bundle directory name (default ifd-ccid.bundle)],
-[bundle="${enableval}"], [bundle=false])
+	AC_HELP_STRING([--enable-bundle=NAME],[bundle directory name
+	(default ifd-ccid.bundle)]),
+	[bundle="${enableval}"], [bundle=false])
 if test "${bundle}" = false ; then
 	bundle="ifd-ccid.bundle"
 fi
@@ -125,8 +140,9 @@
 
 dnl --enable-usbdropdir=DIR
 AC_ARG_ENABLE(usbdropdir,
-[  --enable-usbdropdir=DIR directory containing USB drivers                                                (default /usr/local/pcsc/drivers)],
-[usbdropdir="${enableval}"], [usbdropdir=false])
+	AC_HELP_STRING([--enable-usbdropdir=DIR],[directory containing USB
+	drivers (default /usr/local/pcsc/drivers)]),
+	[usbdropdir="${enableval}"], [usbdropdir=false])
 if test "${usbdropdir}" = false ; then
 	usbdropdir="/usr/local/pcsc/drivers"
 fi
@@ -135,8 +151,9 @@
 
 dnl --enable-debugcritical
 AC_ARG_ENABLE(debugcritical,
-[  --enable-debugcritical  print critical debug messages (default yes)],
-[ debugcritical="${enableval}" ], [ debugcritical=yes ])
+	AC_HELP_STRING([--enable-debugcritical],[print critical debug
+	messages (default yes)]), [ debugcritical="${enableval}" ],
+	[ debugcritical=yes ])
 dnl yes by default
 if test "${debugcritical}" != yes
 then
@@ -148,8 +165,9 @@
 
 dnl --enable-debuginfo
 AC_ARG_ENABLE(debuginfo,
-[  --enable-debuginfo      print info debug messages (default yes)],
-[ debuginfo="${enableval}" ], [ debuginfo=yes ])
+	AC_HELP_STRING([--enable-debuginfo],[print info debug messages
+	(default yes)]),
+	[ debuginfo="${enableval}" ], [ debuginfo=yes ])
 dnl yes by default
 if test "${debuginfo}" != yes
 then
@@ -161,8 +179,9 @@
 
 dnl --enable-debugperiodic
 AC_ARG_ENABLE(debugperiodic,
-[  --enable-debugperiodic  print periodic debug messages (default no)],
-[ debugperiodic="${enableval}" ], [ debugperiodic=no ])
+	AC_HELP_STRING([--enable-debugperiodic],[print periodic debug
+	messages (default no)]),
+	[ debugperiodic="${enableval}" ], [ debugperiodic=no ])
 dnl no by default
 if test "${debugperiodic}" != no
 then
@@ -174,8 +193,9 @@
 
 dnl --enable-debugcomm
 AC_ARG_ENABLE(debugcomm,
-[  --enable-debugcomm      print comm debug messages (default no)],
-[ debugcomm="${enableval}" ], [ debugcomm=no ])
+	AC_HELP_STRING([--enable-debugcomm],[print comm debug messages
+	(default no)]),
+	[ debugcomm="${enableval}" ], [ debugcomm=no ])
 dnl no by default
 if test "${debugcomm}" != no
 then