X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.m4;h=5d7e86d6f054427746ce627ec62e40058e174dfd;hp=bd6cf14000d573e6b75b39f3d97b9943e2093a88;hb=97554b23cfc19394bb77f7f3c4bf0c8abf89297b;hpb=180d8e06b6f1e7fe34b1a80ca1edde0dddf113f1

diff --git a/yaz.m4 b/yaz.m4
index bd6cf14..5d7e86d 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,4 +1,4 @@
-## $Id: yaz.m4,v 1.1 2000-10-11 10:40:56 adam Exp $
+## $Id: yaz.m4,v 1.6 2004-02-05 14:15:42 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
@@ -29,20 +34,30 @@ AC_DEFUN([YAZ_INIT],
 	fi
 	AC_MSG_CHECKING(for YAZ)
 	if $yazconfig --version >/dev/null 2>&1; then
-		YAZLIB=`$yazconfig --libs`
+		YAZLIB=`$yazconfig --libs $1`
 		# if this is empty, it's a simple version YAZ 1.6 script
 		# so we have to source it instead...
 		if test "X$YAZLIB" = "X"; then
 			. $yazconfig
 		else
-			YAZLALIB=`$yazconfig --lalibs`
-			YAZINC=`$yazconfig --cflags`
+			YAZLALIB=`$yazconfig --lalibs $1`
+			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
+])