Enable USE_AUTH_MSG again

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

diff --git a/yaz.m4 b/yaz.m4
index fa49677..796738e 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,5 +1,3 @@
-## $Id: yaz.m4,v 1.5 2004-09-09 09:54:50 adam Exp $
-## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
 
@@ -7,7 +5,7 @@ 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],
+AC_ARG_WITH(docbook-dtd,[[  --with-docbook-dtd=DIR  use docbookx.dtd in DIR]],
 [
        if test -f "$withval/docbookx.dtd"; then
                DTD_DIR=$withval
@@ -15,24 +13,23 @@ AC_ARG_WITH(docbook-dtd, [  --with-docbook-dtd[=DIR]  use docbookx.dtd in DIR],
 ],[
        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 
+       for d in /usr/lib/sgml/dtd/docbook-xml \
+                /usr/share/sgml/docbook/dtd/4.2 \
+                /usr/share/sgml/docbook/dtd/xml/4.* \
+                /usr/share/sgml/docbook/xml-dtd-4.* 
        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)
+       else
+               AC_MSG_RESULT($d)
        fi
 ])
 AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(docbook-dsssl,[  --with-docbook-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 +52,7 @@ AC_ARG_WITH(docbook-dsssl,[  --with-docbook-dsssl[=DIR] use Docbook DSSSL in DIR
        fi
 ])
 AC_SUBST(XSL_DIR)
-AC_ARG_WITH(docbook-xsl,[  --with-docbook-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 +82,7 @@ AC_DEFUN([YAZ_INIT],
        AC_SUBST(YAZVERSION)
        yazconfig=NONE
        yazpath=NONE
-       AC_ARG_WITH(yaz-config, [  --with-yaz-config=DIR   use 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 +91,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
@@ -129,7 +126,10 @@ AC_DEFUN([YAZ_INIT],
                        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])
+                               AC_MSG_ERROR([$YAZVERSION. Requires YAZ $2 or later])
+                       fi
+                       if test "$req_yaz_version" -gt "2000028"; then
+                               YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
                        fi
                fi
        fi