Updates YAZ m4 macros.

diff --git a/configure.in b/configure.in
index 345c77a..9a81f5c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.91.2.3 2004-09-16 14:07:48 adam Exp $
+dnl $Id: configure.in,v 1.91.2.4 2004-09-16 18:36:50 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AM_INIT_AUTOMAKE(idzebra,1.3.18)
@@ -21,61 +21,8 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbookx.dtd)
-   for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
-         /usr/share/sgml/docbook/xml-dtd-4.1.2* \
-         /usr/share/sgml/docbook/xml-dtd-4.1 \
-         /usr/share/sgml/docbook/dtd/xml/4.0 \
-           /usr/lib/sgml/dtd/docbook-xml 
-   do
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbook.dsl],
-[
-   if test -f "$withval/html/docbook.dsl"; then
-      DSSSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-dnl
-AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
-if test "$enable_threads" = "yes"; then
-       yazflag=threads
-else
-       yazflag=""
-fi
 YAZ_INIT($yazflag)
+YAZ_DOC
 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
@@ -163,7 +110,7 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 fi
 dnl
 dnl ------ iconv
-AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      iconv library in DIR])
+AC_ARG_WITH(iconv, [  --with-iconv[=DIR]        iconv library in DIR])
 if test "$with_iconv" != "no"; then
        AC_MSG_CHECKING(for iconv)
        oldLIBS="$LIBS"
@@ -212,7 +159,7 @@ AC_CHECK_LIB(m,sqrt)
 dnl
 dnl ------ EXPAT
 expat=yes
-AC_ARG_WITH(expat,   [  --with-expat[=DIR]      EXPAT library in DIR],[expat=$withval])
+AC_ARG_WITH(expat,   [  --with-expat[=DIR]        EXPAT library in DIR],[expat=$withval])
 if test "$expat" != "no"; then
        xLIBS="$LIBS";
        xCFLAGS="$CFLAGS";
@@ -237,7 +184,7 @@ perl=no
 PERL_XS_INIT="NULL"
 PERL_XS_INIT_INCLUDE=''
 PERL_BINARY=""
-AC_ARG_WITH(perl,   [  --with-perl[=FILE]      perl binary location],[perl=$withval])
+AC_ARG_WITH(perl,   [  --with-perl[=FILE]        perl binary location],[perl=$withval])
 if test "$perl" != "no"; then
        AC_MSG_CHECKING(for perl binary)
        if test "$perl" = "yes"; then

diff --git a/debian/rules b/debian/rules
index ea30983..dad8413 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@
 # This is the debhelper compatability version to use.
 export DH_COMPAT=2
 
-CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yazconfig=/usr/bin --prefix=/usr
+CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yaz=/usr/bin --prefix=/usr
 
 # Enable parallel builds if CONCURRENCY_LEVEL is set
 ifdef CONCURRENCY_LEVEL

diff --git a/yaz.m4 b/yaz.m4
index 83d866b..b47ffc4 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,8 +1,81 @@
-## $Id: yaz.m4,v 1.5 2003-11-28 23:07:10 adam Exp $
+## $Id: yaz.m4,v 1.5.2.1 2004-09-16 18:36:50 adam Exp $
 ## 
-# Use this m4 funciton for autoconf if you use YAZ in your own
+# Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
-# YAZ_INIT
+
+dnl ----- Setup Docbook documentation for YAZ
+AC_DEFUN([YAZ_DOC],
+[
+AC_SUBST(DTD_DIR)      
+AC_ARG_WITH(docbook-dtd, [  --with-docbook-dtd[=DIR]  use docbookx.dtd in DIR],
+[
+       if test -f "$withval/docbookx.dtd"; then
+               DTD_DIR=$withval
+       fi
+],[
+       AC_MSG_CHECKING(for docbookx.dtd)
+       DTD_DIR=""
+       for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
+               /usr/share/sgml/docbook/xml-dtd-4.1.2* \
+               /usr/share/sgml/docbook/xml-dtd-4.1 \
+               /usr/share/sgml/docbook/dtd/xml/4.0 \
+               /usr/lib/sgml/dtd/docbook-xml 
+       do
+               if test -f $d/docbookx.dtd; then
+                       AC_MSG_RESULT($d)
+                       DTD_DIR=$d
+                       break
+               fi
+       done
+       if test -z "$DTD_DIR"; then
+               AC_MSG_RESULT(Not found)
+       fi
+])
+AC_SUBST(DSSSL_DIR)
+AC_ARG_WITH(docbook-dsssl,[  --with-docbook-dsssl[=DIR] use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
+[
+       if test -f "$withval/html/docbook.dsl"; then
+               DSSSL_DIR=$withval
+       fi
+],[
+       AC_MSG_CHECKING(for docbook.dsl)
+       DSSSL_DIR=""
+       for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
+               /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
+               /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
+       do
+               if test -f $d/html/docbook.dsl; then
+                       AC_MSG_RESULT($d)
+                       DSSSL_DIR=$d
+                       break
+               fi
+       done
+       if test -z "$DSSSL_DIR"; then
+               AC_MSG_RESULT(Not found)
+       fi
+])
+AC_SUBST(XSL_DIR)
+AC_ARG_WITH(docbook-xsl,[  --with-docbook-xsl[=DIR]  use Docbook XSL in DIR/{htmlhelp,xhtml}],
+[
+       if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
+               XSL_DIR=$withval
+       fi
+],[
+       AC_MSG_CHECKING(for htmlhelp.xsl)
+       for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+               /usr/share/sgml/docbook/xsl-stylesheets-1.* 
+       do
+               if test -f $d/htmlhelp/htmlhelp.xsl; then
+                       AC_MSG_RESULT($d)
+                       XSL_DIR=$d
+                       break
+               fi
+       done
+       if test -z "$XSL_DIR"; then
+               AC_MSG_RESULT(Not found)
+       fi
+])
+]) 
 
 AC_DEFUN([YAZ_INIT],
 [
@@ -12,7 +85,7 @@ AC_DEFUN([YAZ_INIT],
        AC_SUBST(YAZVERSION)
        yazconfig=NONE
        yazpath=NONE
-       AC_ARG_WITH(yazconfig, [  --with-yazconfig=DIR    yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
+       AC_ARG_WITH(yaz, [  --with-yaz=DIR          use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
        if test "x$yazpath" != "xNONE"; then
                yazconfig=$yazpath/yaz-config
        else
@@ -44,10 +117,21 @@ AC_DEFUN([YAZ_INIT],
                        YAZINC=`$yazconfig --cflags $1`
                        YAZVERSION=`$yazconfig --version`
                fi
-               AC_MSG_RESULT($yazconfig)
+               AC_MSG_RESULT([$yazconfig])
        else
                AC_MSG_RESULT(Not found)
                YAZVERSION=NONE
        fi
-])
-       
+       if test "X$YAZVERSION" != "XNONE"; then
+               AC_MSG_CHECKING([for YAZ version])
+               AC_MSG_RESULT([$YAZVERSION])
+               if test "$2"; then
+                       have_yaz_version=`echo "$YAZVERSION" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
+                       req_yaz_version=`echo "$2" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
+                       if test "$have_yaz_version" -lt "$req_yaz_version"; then
+                               AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
+                       fi
+               fi
+       fi
+]) 
+