Bump version to 1.1.0

[yazproxy-moved-to-github.git] / yaz.m4

diff --git a/yaz.m4 b/yaz.m4
index 539f9f5..9626319 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,5 +1,3 @@
-## $Id: yaz.m4,v 1.2 2004-08-16 12:38:22 adam Exp $
-## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
 
@@ -7,10 +5,10 @@ dnl ----- Setup Docbook documentation for YAZ
 AC_DEFUN([YAZ_DOC],
 [
 AC_SUBST(DTD_DIR)      
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
+AC_ARG_WITH(docbook-dtd, [  --with-docbook-dtd[=DIR]  use docbookx.dtd in DIR],
 [
        if test -f "$withval/docbookx.dtd"; then
-               DTD_DIR=$withva l
+               DTD_DIR=$withval
        fi
 ],[
        AC_MSG_CHECKING(for docbookx.dtd)
@@ -32,7 +30,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
        fi
 ])
 AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
+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
@@ -55,7 +53,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      use Docbook DSSSL in DIR/{html,prin
        fi
 ])
 AC_SUBST(XSL_DIR)
-AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtml}],
+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
@@ -85,7 +83,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
@@ -94,7 +92,7 @@ AC_DEFUN([YAZ_INIT],
                else
                        yazsrcdir=$srcdir
                fi
-               for i in ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz ../yaz* ../yaz; do
+               for i in ${yazsrcdir}/../../yaz ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz; do
                        if test -d $i; then
                                if test -r $i/yaz-config; then
                                        yazconfig=$i/yaz-config
@@ -131,6 +129,9 @@ AC_DEFUN([YAZ_INIT],
                        if test "$have_yaz_version" -lt "$req_yaz_version"; then
                                AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
                        fi
+                       if test "$req_yaz_version" -gt "2000028"; then
+                               YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
+                       fi
                fi
        fi
 ])