From 94018089d9c75e5f787430892273cfb776ad374a Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sat, 6 Oct 2001 08:16:30 +0000
Subject: [PATCH] Configure detects POSIX Threads on OpenBSD (and others,
 perhaps).

---
 configure.in      |   20 ++++++++++++++++++--
 ztest/Makefile.am |    6 ++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index cdb3556..830a28f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.48 2001-10-05 13:55:17 adam Exp $
+dnl $Id: configure.in,v 1.49 2001-10-06 08:16:30 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -148,6 +148,7 @@ dnl ------ POSIX Threads
 AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	OLIBS=$LIBS
+	OCC=$CC
 	AC_CHECK_LIB(pthread,main)
 	AC_MSG_CHECKING(for working POSIX Threads)
 	AC_TRY_LINK([#include <pthread.h>
@@ -157,13 +158,28 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	pthread_create (&pthread_id, 0, func, 0);],
 		thread_ok=yes,thread_ok=no)
 	if test "$thread_ok" = "yes"; then
-		LIBTHREAD=-lpthread
 		AC_MSG_RESULT(yes)
+		LIBTHREAD=-lpthread
 		CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
 		HAVETHREADS=1
 	else
+		CC="$CC -pthread"
+		AC_TRY_LINK([#include <pthread.h>
+			void *func(void *p) { return 0; }
+			],[
+			pthread_t pthread_id;
+			pthread_create (&pthread_id, 0, func, 0);],
+			thread_ok=yes,thread_ok=no)
+		if test "$thread_ok" = "yes"; then
+			AC_MSG_RESULT([yes,BSD])
+			CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+			HAVETHREADS=1
+		fi
+	fi
+	if test "$thread_ok" = "no"; then
 		AC_MSG_RESULT(no)
 	fi
+	CC=$OCC
 	LIBS=$OLIBS
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
diff --git a/ztest/Makefile.am b/ztest/Makefile.am
index 46ef046..d0fef0b 100644
--- a/ztest/Makefile.am
+++ b/ztest/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6 2001-10-05 13:55:17 adam Exp $
+## $Id: Makefile.am,v 1.7 2001-10-06 08:16:30 adam Exp $
 
 bin_PROGRAMS=yaz-ztest
 
@@ -11,4 +11,6 @@ extra=../lib/libyazthread.la
 endif
 yaz_ztest_LDADD=$(extra) ../lib/libyaz.la $(LIBTHREAD)
 
-INCLUDES=-I$(top_srcdir)/include @CFLAGSTHREADS@
+CFLAGS=@CFLAGSTHREADS@
+
+INCLUDES=-I$(top_srcdir)/include
-- 
1.7.10.4