From ede88f279b65d43cb53204dc9d15ff79d57680f6 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 5 Feb 2004 11:56:10 +0000
Subject: [PATCH] Use new yaz.m4

---
 configure.in |    2 +-
 yaz.m4       |   20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index afd2b00..0363baf 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_HEADER_STDC
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
-YAZ_INIT(threads)
+YAZ_INIT(threads,2.0.10)
 
 dnl
 dnl ----- libXSLT
diff --git a/yaz.m4 b/yaz.m4
index fce55dc..65097e5 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,4 +1,4 @@
-## $Id: yaz.m4,v 1.4 2002-11-27 00:58:28 adam Exp $
+## $Id: yaz.m4,v 1.5 2004-02-05 11:56:10 adam Exp $
 ## 
 # Use this m4 funciton for autoconf if you use YAZ in your own
 # configure script.
@@ -44,10 +44,22 @@ 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
+		else
+			AC_MSG_RESULT([$YAZVERSION])
+		fi
+	fi
+]) 
-- 
1.7.10.4