X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=715f120596a0e1a87bf57a56a1e28e941c8bef42;hp=b9ea1072cd248941bf0c4c7cd6f55debdabc6058;hb=527dab66d9847bb7f8a931c558306a070064bf25;hpb=9757a9ac857180889850aec2756595c04501aeb7

diff --git a/configure.ac b/configure.ac
index b9ea107..715f120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.41 2006-11-28 11:42:13 adam Exp $
+dnl Zebra, Index Data ApS, 1995-2007
+dnl $Id: configure.ac,v 1.71 2007-12-20 19:08:35 adam Exp $
 dnl
 AC_PREREQ(2.59)
-AC_INIT([idzebra],[2.0.6],[zebra-help@indexdata.dk])
+AC_INIT([idzebra],[2.0.22],[zebra-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE([1.8])
@@ -23,25 +23,18 @@ dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AM_PROG_LIBTOOL
+AC_DEFINE_UNQUOTED(HOST_TRIPLET,"${host}")
 dnl
 dnl ------ headers
-AC_CHECK_HEADERS(sys/resource.h sys/times.h sys/time.h sys/wait.h sys/utsname.h unistd.h)
+AC_CHECK_HEADERS([sys/resource.h sys/time.h sys/wait.h sys/utsname.h unistd.h])
 dnl ------ crypt
-AC_CHECK_LIB(crypt, crypt)
+AC_CHECK_LIB([crypt],[crypt])
 if test "$ac_cv_lib_crypt_crypt" = "yes"; then
     AC_CHECK_HEADERS(crypt.h)
 fi
 dnl
-dnl ------ threads
-AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
-if test "$enable_threads" = "yes"; then
-    yazflag=threads
-else
-    yazflag=""
-fi
-dnl
 dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.40)
+YAZ_INIT([server icu],[3.0.17])
 if test "$YAZVERSION" = "NONE"; then
     AC_MSG_ERROR([YAZ development libraries required])
 fi
@@ -107,7 +100,7 @@ else
 fi
 dnl
 dnl ------ various functions
-AC_CHECK_FUNCS(mkstemp)
+AC_CHECK_FUNCS(mkstemp atoll)
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
@@ -208,48 +201,15 @@ if test "$expat" != "no"; then
 fi
 dnl
 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];
-	int fd;
-	struct flock area;
-	if (sizeof(off_t) != 8) 
-		exit (1);
-	o = 2000000000;
-	if ((o+o+o) / 3 != o)
-		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
-    AC_DEFINE(_FILE_OFFSET_BITS,64)
-    AC_MSG_RESULT(yes)
+AC_SYS_LARGEFILE
+AC_CHECK_TYPES([long long])
+if test "${ac_cv_type_long_long}" = "yes"; then
+    ZINT_VALUE=1
 else
-    AC_MSG_RESULT(no)
-fi
-AC_CHECK_SIZEOF([off_t])
-AC_CHECK_SIZEOF([long long])
-ZEBRA_CFLAGS="-DZEBRA_ZINT=${ac_cv_sizeof_long_long}"
-AC_DEFINE_UNQUOTED(ZEBRA_ZINT,${ac_cv_sizeof_long_long})
+    ZINT_VALUE=0
+fi 
+ZEBRA_CFLAGS="-DZEBRA_ZINT=${ZINT_VALUE}"
+AC_DEFINE_UNQUOTED(ZEBRA_ZINT,${ZINT_VALUE})
 dnl ------ Modules
 AC_SUBST(SHARED_MODULE_LA)
 SHARED_MODULE_LA=""
@@ -293,7 +253,6 @@ AC_DEFINE(IDZEBRA_STATIC_GRS_SGML)
 ZEBRA_MODULE(text,shared,    [  --enable-mod-text       Text filter])
 ZEBRA_MODULE(grs-regx,shared,[  --enable-mod-grs-regx   REGX/TCL filter])
 ZEBRA_MODULE(grs-marc,shared,[  --enable-mod-grs-marc   MARC filter])
-ZEBRA_MODULE(safari,shared,  [  --enable-mod-safari Safari filter (DBC)])
 if test "$ac_cv_header_expat_h" = "yes"; then
     def="shared"
 else
@@ -322,8 +281,10 @@ AC_PREPROC_IFELSE(
    [def="shared"],
    [def="disabled"])
 CPPFLAGS=$oldCPPFLAGS
+ZEBRA_MODULE(dom,[$def],   [  --enable-mod-dom        XML/XSLT filter (Requires libxslt)])
+ZEBRA_MODULE(alvis,[$def], [  --enable-mod-alvis      ALVIS filter (Requires libxslt)])
+ZEBRA_MODULE(safari,shared,[  --enable-mod-safari     Safari filter (DBC)])
 
-ZEBRA_MODULE(alvis,[$def],   [  --enable-mod-alvis      ALVIS filter (Requires libxslt)])
 dnl ------ ANSI C Header files
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then