X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz.m4;h=9626319ff02611bf61a0985936989a78f62f9adc;hb=a8be496e66ed5ba01a42537e4aa29c6670cd3037;hp=876764c1bf564a90ab8a25f70826fe68834ce35e;hpb=7af723a4a7a2ca0dce8c245a316120fbd9ca04db;p=idzebra-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index 876764c..9626319 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,5 +1,3 @@
-## $Id: yaz.m4,v 1.8 2004-09-11 20:52:55 adam Exp $
-## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
 
@@ -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
 ])