Align Zebra API more so that ZEBRA_RES is used to signal error/OK.

[idzebra-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 9ab20c5..42c973b 100644 (file)
--- 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.122 2005-05-11 12:39:36 adam Exp $
 dnl
 AC_INIT(include/idzebra/version.h)
 AM_INIT_AUTOMAKE(idzebra,1.4.0)
@@ -26,7 +26,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 +42,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 +278,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
 ])