X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=280e029627c528cf51e36090f9b7765bb31e0d78;hp=6fb60ad9054ace1af82ff04be07d72412af27142;hb=131e8143a9b8da294d582f0793833679101a2672;hpb=cc1c1b6d188dd076ef2aa2b539852f3afb8ad111 diff --git a/configure.ac b/configure.ac index 6fb60ad..280e029 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -dnl Zebra, Index Data ApS, 1995-2007 -dnl $Id: configure.ac,v 1.57 2007-05-09 07:30:43 adam Exp $ +dnl Zebra, Index Data ApS, 1995-2008 +dnl $Id: configure.ac,v 1.77 2008-03-05 09:29:09 adam Exp $ dnl -AC_PREREQ(2.59) -AC_INIT([idzebra],[2.0.13],[zebra-help@indexdata.dk]) +AC_PREREQ(2.60) +AC_INIT([idzebra],[2.0.27],[zebra-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE([1.8]) +AM_INIT_AUTOMAKE([1.9]) PACKAGE_SUFFIX="-2.0" AC_SUBST(PACKAGE_SUFFIX) dnl http://www.gnu.org/software/libtool/manual.html#Versioning @@ -23,6 +23,7 @@ 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/time.h sys/wait.h sys/utsname.h unistd.h]) @@ -33,7 +34,7 @@ if test "$ac_cv_lib_crypt_crypt" = "yes"; then fi dnl dnl ------ YAZ -YAZ_INIT([server],[3.0.2]) +YAZ_INIT([server icu],[3.0.17]) if test "$YAZVERSION" = "NONE"; then AC_MSG_ERROR([YAZ development libraries required]) fi @@ -200,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 -#include -#include -#include -#include -#include -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="" @@ -356,9 +324,12 @@ AC_OUTPUT([ test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile test/espec/Makefile test/filters/Makefile - examples/Makefile examples/gils/Makefile examples/zthes/Makefile - examples/marc21/Makefile examples/marcxml/Makefile - examples/alvis-oai/Makefile + examples/Makefile + examples/gils/Makefile + examples/marc21/Makefile + examples/marcxml/Makefile + examples/oai-pmh/Makefile + examples/zthes/Makefile idzebra.spec idzebra-config-2.0 Doxyfile