X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=yaz.m4;h=2782a1d12a05cb0f2714fc3c29f43322bd83d0a9;hp=f8c360eb9617bf1ddf5e15d05dea996dd568bbbe;hb=8741c1d215d27d68e439815706aa13c2bb00a440;hpb=203ca914d05f1ece54040ff241543f3bff6938a7

diff --git a/yaz.m4 b/yaz.m4
index f8c360e..2782a1d 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -5,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
@@ -13,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
@@ -53,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
@@ -129,6 +128,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
 ])