X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=yaz.m4;h=9626319ff02611bf61a0985936989a78f62f9adc;hp=a0f4d6a24f5083082202e2d30295fbdcc10f2090;hb=2bab0500e690612c044b1d9f87a0f03bc1640743;hpb=ec08a2fc1e27918e9ea04e03988f0479c99f2e2f diff --git a/yaz.m4 b/yaz.m4 index a0f4d6a..9626319 100644 --- a/yaz.m4 +++ b/yaz.m4 @@ -1,5 +1,3 @@ -## $Id: yaz.m4,v 1.6 2004-09-11 20:54:30 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 ])