X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=52da348646694d6f04eb4899395c70448053990f;hb=74c8a62d1403d51315d58bd293b6284490e78003;hp=9ab20c58caa8bb3aa44999dfbb194b8aedb1fe09;hpb=0f3b8bcc6fe2e3beeec7c834d9a64dca48a4f1b7;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index 9ab20c5..52da348 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Zebra, Index Data ApS, 1995-2005 -dnl $Id: configure.in,v 1.119 2005-04-28 08:20:39 adam Exp $ +dnl $Id: configure.in,v 1.124 2005-05-24 20:39:02 adam Exp $ dnl AC_INIT(include/idzebra/version.h) AM_INIT_AUTOMAKE(idzebra,1.4.0) @@ -16,6 +16,11 @@ AM_PROG_LIBTOOL dnl dnl ------ headers AC_CHECK_HEADERS(sys/times.h unistd.h) +dnl ------ 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]) @@ -26,7 +31,7 @@ else fi dnl dnl ------ YAZ -YAZ_INIT($yazflag,2.1.3) +YAZ_INIT($yazflag,2.1.5) YAZ_DOC dnl ----- libXSLT AC_SUBST(XSLT_LIBS) @@ -42,12 +47,19 @@ if test "$xsltdir" = "yes"; then fi if test "$xsltdir" != "no"; then AC_MSG_CHECKING(for libXSLT) + if test -x $xsltdir/bin/xslt-config; then - XSLT_LIBS=`$xsltdir/bin/xslt-config --libs` - XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags` XSLT_VER=`$xsltdir/bin/xslt-config --version` AC_MSG_RESULT($XSLT_VER) - AC_DEFINE(HAVE_XSLT) + have_xslt_version=`echo "$XSLT_VER" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` + if test $have_xslt_version -lt 1001012; then + AC_MSG_WARN([libXSLT too old. Use 1.1.12 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 @@ -271,7 +283,8 @@ AC_DEFUN([ZEBRA_MODULE],[ elif test "$myen" = "no"; then AC_MSG_RESULT([disabled]) else - AC_MSG_RESULT([bad value. Assuming disabled]) + AC_MSG_RESULT([$myen]) + AC_MSG_ERROR([invalid --enable-mod-$1 value. Use on,off,static or shared]) fi ])