X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=b9ea1072cd248941bf0c4c7cd6f55debdabc6058;hp=749280adcc1000bf542bed8b1bd07aa00b6e18e3;hb=9757a9ac857180889850aec2756595c04501aeb7;hpb=f244ffa34c34fa73f55e0981a59ec298b36935bf diff --git a/configure.ac b/configure.ac index 749280a..b9ea107 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,15 @@ dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.26 2006-08-14 12:18:46 adam Exp $ +dnl $Id: configure.ac,v 1.41 2006-11-28 11:42:13 adam Exp $ dnl AC_PREREQ(2.59) -AC_INIT([idzebra],[2.0.0],[adam@indexdata.dk]) +AC_INIT([idzebra],[2.0.6],[zebra-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([1.8]) PACKAGE_SUFFIX="-2.0" AC_SUBST(PACKAGE_SUFFIX) -ZEBRALIBS_VERSION_INFO=0:0:0 +dnl http://www.gnu.org/software/libtool/manual.html#Versioning +ZEBRALIBS_VERSION_INFO=0:1:0 AC_SUBST(ZEBRALIBS_VERSION_INFO) main_zebralib=index/libidzebra${PACKAGE_SUFFIX}.la AC_SUBST(main_zebralib) @@ -16,6 +17,7 @@ dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) AC_SUBST(READLINE_LIBS) +AC_SUBST(ZEBRA_CFLAGS) dnl dnl ------ Checking programs AC_PROG_CC @@ -23,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/times.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 @@ -39,42 +41,11 @@ else fi dnl dnl ------ YAZ -YAZ_INIT($yazflag,2.1.20) +YAZ_INIT($yazflag,2.1.40) if test "$YAZVERSION" = "NONE"; then AC_MSG_ERROR([YAZ development libraries required]) fi YAZ_DOC -dnl ----- libXSLT -AC_SUBST(XSLT_LIBS) -AC_SUBST(XSLT_CFLAGS) -xsltdir=yes -AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libxslt in PREFIX]],xsltdir=$withval) -if test "$xsltdir" = "yes"; then - for d in /usr /usr/local; do - if test -x $d/bin/xslt-config; then - xsltdir=$d - fi - done -fi -if test "$xsltdir" != "no"; then - AC_MSG_CHECKING(for libXSLT) - - if test -x $xsltdir/bin/xslt-config; then - XSLT_VER=`$xsltdir/bin/xslt-config --version` - AC_MSG_RESULT($XSLT_VER) - have_xslt_version=`echo "$XSLT_VER" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` - if test $have_xslt_version -lt 1001011; then - AC_MSG_WARN([libXSLT too old. Use 1.1.11 or later.]) - XSLT_VER="" - else - XSLT_LIBS=`$xsltdir/bin/xslt-config --libs` - XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags` - AC_DEFINE(HAVE_XSLT) - fi - else - AC_MSG_RESULT(Not found) - fi -fi dnl ------ Look for Tcl dnl See if user has specified location of tclConfig.sh; otherwise dnl see if tclConfig.sh exists in same prefix lcoation as tclsh; otherwise @@ -116,8 +87,12 @@ if test -r ${tclconfig}/tclConfig.sh; then SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX SHLIB_VERSION=$TCL_SHLIB_VERSION AC_MSG_RESULT($TCL_VERSION) - AC_DEFINE(HAVE_TCL_H,1) - + + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="${TCL_INCLUDE} $CPPFLAGS" + AC_CHECK_HEADERS(tcl.h) + CPPFLAGS=${old_CPPFLAGS} + # The Mac OSX -framework causes problems with Libtool # and dependancy libs.. so apply Tcl libs everywhere bug #461 case $host in @@ -250,9 +225,8 @@ int main(int argc, char **argv) if (sizeof(off_t) != 8) exit (1); o = 2000000000; - sprintf (tmp_str, "%Ld", o+o+o); - if (strcmp (tmp_str, "6000000000")) - exit (1); + if ((o+o+o) / 3 != o) + exit(1); fd = creat ("config.tmp", 0644); if (fd < 0) exit (1); @@ -274,7 +248,8 @@ else fi AC_CHECK_SIZEOF([off_t]) AC_CHECK_SIZEOF([long long]) -AC_CHECK_SIZEOF([long]) +ZEBRA_CFLAGS="-DZEBRA_ZINT=${ac_cv_sizeof_long_long}" +AC_DEFINE_UNQUOTED(ZEBRA_ZINT,${ac_cv_sizeof_long_long}) dnl ------ Modules AC_SUBST(SHARED_MODULE_LA) SHARED_MODULE_LA="" @@ -314,8 +289,8 @@ 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)]) @@ -325,11 +300,29 @@ else def="disabled" fi ZEBRA_MODULE(grs-xml,[$def], [ --enable-mod-grs-xml XML filter (Expat based)]) -if test "$XSLT_VER"; then - def="shared" -else - def="disabled" -fi +oldCPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $YAZINC" +AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([[ +#if YAZ_HAVE_XML2 +#include +#include +#include +#include +#include +#include +#else +#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(alvis,[$def], [ --enable-mod-alvis ALVIS filter (Requires libxslt)]) dnl ------ ANSI C Header files AC_STDC_HEADERS