dnl Zebra, Index Data Aps, 1994-2000
-dnl $Id: configure.in,v 1.24 2000-10-17 12:37:09 adam Exp $
+dnl $Id: configure.in,v 1.28 2001-02-28 09:01:41 adam Exp $
dnl
AC_INIT(include/zebraver.h)
AC_MSG_CHECKING(for package)
AM_INIT_AUTOMAKE(zebra,1.1)
if test ! -r ${srcdir}/isam; then
mkdir ${srcdir}/isam
- touch ${srcdir}/isam/Makefile.in
fi
+ touch ${srcdir}/isam/Makefile.in
if test ! -r ${srcdir}/isamc; then
mkdir ${srcdir}/isamc
- touch ${srcdir}/isamc/Makefile.in
fi
+ touch ${srcdir}/isamc/Makefile.in
if test ! -r ${srcdir}/isamb; then
mkdir ${srcdir}/isamb
- touch ${srcdir}/isamb/Makefile.in
fi
+ touch ${srcdir}/isamb/Makefile.in
fi
AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol)
dnl ------ Substitutions
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
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)
if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then
AC_CHECK_HEADERS(bzlib.h)
+else
+ AC_CHECK_LIB(bz2,BZ2_bzCompressInit)
+ if test "$ac_cv_lib_bz2_BZ2_bzCompressInit" = "yes"; then
+ AC_CHECK_HEADERS(bzlib.h)
+ fi
fi
dnl ------- 64 bit files
AC_MSG_CHECKING(for LFS)
AC_TRY_RUN([#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
int main(int argc, char **argv)
{
off_t o;
char tmp_str[32];
- if (sizeof(off_t) == 8) {
- o = 2000000000;
- sprintf (tmp_str, "%Ld", o+o+o);
- if (!strcmp (tmp_str, "6000000000"))
- exit (0);
- }
- exit (1);
+ int fd;
+ struct flock area;
+ if (sizeof(off_t) != 8)
+ exit (1);
+ o = 2000000000;
+ sprintf (tmp_str, "%Ld", o+o+o);
+ if (strcmp (tmp_str, "6000000000"))
+ exit (1);
+ fd = creat ("config.tmp", 0644);
+ if (fd < 0)
+ exit (1);
+ area.l_type = F_WRLCK;
+ area.l_whence = SEEK_SET;
+ area.l_len = area.l_start = 0L;
+ if (fcntl(fd, F_SETLKW, &area))
+ exit (1);
+ close (fd);
+ unlink ("config.tmp");
+ exit (0);
}
],bits=64,bits=32,bits=32)
if test "$bits" = "64"; then