X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz.m4;h=05ae608125c78d61e4000c3543d9501c1959923a;hb=1b6019ff065a98af709be905adc6c08094471d57;hp=32bfdb7d46c21496113bb55505bfb3df7833d591;hpb=f304b5971574644559b065a70a0a964a87a55e77;p=yazpp-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index 32bfdb7..05ae608 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,4 +1,4 @@
-## $Id: yaz.m4,v 1.1 2001-02-21 11:25:07 adam Exp $
+## $Id: yaz.m4,v 1.6 2004-02-05 14:18:34 adam Exp $
 ## 
 # Use this m4 funciton for autoconf if you use YAZ in your own
 # configure script.
@@ -16,7 +16,12 @@ AC_DEFUN([YAZ_INIT],
 	if test "x$yazpath" != "xNONE"; then
 		yazconfig=$yazpath/yaz-config
 	else
-		for i in ../yaz* ../yaz; do
+		if test "x$srcdir" = "x"; then
+			yazsrcdir=.
+		else
+			yazsrcdir=$srcdir
+		fi
+		for i in ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz ../yaz* ../yaz; do
 			if test -d $i; then
 				if test -r $i/yaz-config; then
 					yazconfig=$i/yaz-config
@@ -39,10 +44,20 @@ AC_DEFUN([YAZ_INIT],
 			YAZINC=`$yazconfig --cflags $1`
 			YAZVERSION=`$yazconfig --version`
 		fi
-		AC_MSG_RESULT($yazconfig)
+		AC_MSG_RESULT([$yazconfig])
 	else
 		AC_MSG_RESULT(Not found)
 		YAZVERSION=NONE
 	fi
-])
-	
+	if test "X$YAZVERSION" != "XNONE"; then
+		AC_MSG_CHECKING([for YAZ version])
+		AC_MSG_RESULT([$YAZVERSION])
+		if test "$2"; then
+			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])
+			fi
+		fi
+	fi
+])