X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=2895d1377387eeca04c5bf8dcaae31a83002342c;hb=bd797d70f666280cdf941337d86b438a8d2506fc;hp=0b5ccde23b9b5f65dbf376a2549b837c83476f62;hpb=789def370a1ed54daee69faaa3814ab7a8bdf47e;p=idzebra-moved-to-github.git diff --git a/configure.ac b/configure.ac index 0b5ccde..2895d13 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.35 2006-11-03 23:17:08 adam Exp $ +dnl Zebra, Index Data ApS, 1995-2007 +dnl $Id: configure.ac,v 1.51 2007-02-07 13:19:35 marc Exp $ dnl AC_PREREQ(2.59) -AC_INIT([idzebra],[2.0.4],[adam@indexdata.dk]) +AC_INIT([idzebra],[2.0.12],[zebra-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([1.8]) @@ -25,7 +25,7 @@ AC_PROG_CPP AM_PROG_LIBTOOL dnl dnl ------ headers -AC_CHECK_HEADERS(sys/resource.h sys/times.h sys/time.h sys/wait.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) if test "$ac_cv_lib_crypt_crypt" = "yes"; then @@ -41,7 +41,7 @@ else fi dnl dnl ------ YAZ -YAZ_INIT($yazflag,2.1.35) +YAZ_INIT($yazflag,2.1.47) if test "$YAZVERSION" = "NONE"; then AC_MSG_ERROR([YAZ development libraries required]) fi @@ -107,7 +107,7 @@ else fi dnl dnl ------ various functions -AC_CHECK_FUNCS(mkstemp) +AC_CHECK_FUNCS(mkstemp atoll) dnl dnl ------ GNU Readline READLINE_SHARED_LIBADD="" @@ -289,11 +289,10 @@ AC_DEFUN([ZEBRA_MODULE],[ fi ]) -ZEBRA_MODULE(text,static, [ --enable-mod-text Text filter]) -ZEBRA_MODULE(grs-sgml,static,[ --enable-mod-grs-sgml Simple SGML/XML filter]) +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 @@ -303,18 +302,29 @@ ZEBRA_MODULE(grs-xml,[$def], [ --enable-mod-grs-xml XML filter (Expat based) oldCPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $YAZINC" AC_PREPROC_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[ -#if YAZ_HAVE_XSLT + [AC_LANG_PROGRAM([[ +#if YAZ_HAVE_XML2 +#include +#include +#include +#include +#include +#include #else -#error no xslt +#error Libxml2 not available +#endif +]],[[ +#if LIBXML_VERSION < 20615 +#error Libxml2 version < 2.6.15. xmlreader not reliable/present #endif ]])], [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