[Pcsclite-cvs-commit] Drivers/ccid Makefile.am,1.5,1.6 config.h.in,1.2,1.3 configure.in,1.9,1.10 reconf,1.2,1.3

[rousseau@quantz.debian.org]

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

Modified Files:
	Makefile.am config.h.in configure.in reconf 
Log Message:
use a updated version of acx_pthread.m4 needed for FreeBSD


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	1 Nov 2003 00:40:36 -0000	1.5
+++ Makefile.am	25 Nov 2003 22:55:57 -0000	1.6
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = src readers
+SUBDIRS = aclocal src readers
 
 AUX_DIST = \
 	$(ac_aux_dir)/aclocal.m4 \

Index: config.h.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.h.in	22 Sep 2003 14:21:57 -0000	1.2
+++ config.h.in	25 Nov 2003 22:55:58 -0000	1.3
@@ -33,8 +33,8 @@
 /* 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 if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
 
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
@@ -98,6 +98,10 @@
 
 /* directory containing USB drivers */
 #undef PCSCLITE_HP_DROPDIR
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS

Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.in	6 Nov 2003 18:53:40 -0000	1.9
+++ configure.in	25 Nov 2003 22:55:58 -0000	1.10
@@ -17,7 +17,6 @@
 dnl Automake boilerplate.
 AC_CANONICAL_HOST
 
-
 dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
 AM_CONFIG_HEADER(config.h)
 
@@ -127,9 +126,10 @@
 	[ 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 ])
+	ACX_PTHREAD(
+		[ AC_DEFINE(HAVE_PTHREAD, 1,
+			[Define if you have POSIX threads libraries and header files.])
+	   	], [ AC_MSG_ERROR([POSIX thread support required]) ])
 fi
 AC_MSG_RESULT([multi threading         : $multithread])
 
@@ -217,6 +217,6 @@
 AC_SUBST(usbdropdir)
 
 dnl Write Makefiles.
-AC_CONFIG_FILES(Makefile src/Makefile readers/Makefile)
+AC_CONFIG_FILES(Makefile aclocal/Makefile src/Makefile readers/Makefile)
 AC_OUTPUT
 

Index: reconf
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/reconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- reconf	31 Oct 2003 23:52:18 -0000	1.2
+++ reconf	25 Nov 2003 22:55:58 -0000	1.3
@@ -13,5 +13,6 @@
   make distclean
 fi
 rm -rf *.cache *.m4 build/{config.guess,config.sub,depcomp,ltmain.sh} config.log config.status
+(cat aclocal/*.m4 > acinclude.m4)
 autoreconf --verbose --install