X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=yaz.m4;h=9626319ff02611bf61a0985936989a78f62f9adc;hp=17f8a82bfafa5219d04c01f73c36db21e02923a6;hb=d5a8ee1e23a1a151340595c819c6dd568e34a5b3;hpb=aa156ff52ded7be25d8a831fd161dcf925441ee8

diff --git a/yaz.m4 b/yaz.m4
index 17f8a82..9626319 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,5 +1,3 @@
-## $Id: yaz.m4,v 1.3 2004-09-09 09:47:20 adam Exp $
-## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
 
@@ -10,7 +8,7 @@ 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=$withva	l
+		DTD_DIR=$withval
 	fi
 ],[
 	AC_MSG_CHECKING(for docbookx.dtd)
@@ -85,7 +83,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 +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
 ])