X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=28f705e769bc681b3cf0e64569bd7df6f6ffa33f;hp=6100f90319280c641516154396a93f64a3c69a0d;hb=df117f4652b6999cf689cf5e2e65f8d8541ab4b0;hpb=2b33b395b50c562323ea2b0251f9b798cf5241d2

diff --git a/configure.in b/configure.in
index 6100f90..28f705e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1994-2000
-dnl $Id: configure.in,v 1.23 2000-10-11 12:31:27 adam Exp $
+dnl $Id: configure.in,v 1.25 2000-11-29 14:24:01 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AC_MSG_CHECKING(for package)
@@ -8,25 +8,11 @@ if test -r ${srcdir}/LICENSE.zmbol; then
 	PROGPREFIX=zmbol
 	AC_DEFINE(ZMBOL,1)
 	AM_INIT_AUTOMAKE(zmbol,1.1)
-        SUBLIBS="../rset/librset.a \
- ../dict/libdict.a \
- ../isamb/libisamb.a \
- ../isams/libisams.a \
- ../isam/libisam.a \
- ../isamc/libisamc.a \
- ../recctrl/librecctrl.a \
- ../bfile/libbfile.a \
- ../dfa/libdfa.a \
- ../util/libutil.a"
 else
 	AC_MSG_RESULT([Zebra])
 	PROGPREFIX=zebra
 	AC_DEFINE(ZMBOL,0)
 	AM_INIT_AUTOMAKE(zebra,1.1)
-        SUBLIBS="../rset/librset.a ../dict/libdict.a ../isams/libisams.a \
-	../recctrl/librecctrl.a  \
-	../bfile/libbfile.a ../dfa/libdfa.a \
- 	../util/libutil.a"
 	if test ! -r ${srcdir}/isam; then
 		mkdir ${srcdir}/isam
 		touch ${srcdir}/isam/Makefile.in
@@ -42,7 +28,6 @@ else
 fi
 AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol)
 dnl ------ Substitutions
-AC_SUBST(SUBLIBS)
 AC_SUBST(DEFS)
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -54,27 +39,7 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-YAZ_INIT
-
-dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
-if test "$enable_threads" = "yes"; then
-	AC_CHECK_LIB(pthread,main)
-	AC_MSG_CHECKING(for working POSIX Threads)
-	AC_TRY_LINK([#include <pthread.h>
-	int func(void *p) { return 0; }
-	],[
-	pthread_t pthread_id;
-	int r = pthread_create (&pthread_id, 0, func, 0);],
-		thread_ok=yes,thread_ok=no)
-	if test "$thread_ok" = "yes"; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_PTHREAD_H)
-		AC_DEFINE(_REENTRANT)
-	else
-		AC_MSG_RESULT(no)
-	fi
-fi
+YAZ_INIT(threads)
 dnl
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
@@ -112,7 +77,7 @@ else
 fi
 dnl
 dnl ------ times
-AC_CHECK_HEADERS(sys/times.h)
+AC_CHECK_HEADERS(sys/times.h pthread.h)
 dnl
 dnl ------- BZIP2
 AC_CHECK_LIB(bz2,bzCompressInit)