From 535f9a05785e1f0c49d658d0467479b63e20bbdd Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 Oct 2000 12:49:35 +0000
Subject: [PATCH] Added YAZ in aclocal.m4.

---
 aclocal.m4 |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index 0df5c2f..ad9609b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -115,3 +115,50 @@ else
   $1_FALSE=
 fi])
 
+# Use this m4 funciton for autoconf if you use YAZ in your own
+# configure script.
+# YAZ_INIT
+
+AC_DEFUN([YAZ_INIT],
+[
+	AC_SUBST(YAZLIB)
+	AC_SUBST(YAZLALIB)
+	AC_SUBST(YAZINC)
+	AC_SUBST(YAZVERSION)
+	yazconfig=NONE
+	yazpath=NONE
+	AC_ARG_WITH(yazconfig, [  --with-yazconfig=DIR    yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
+	if test "x$yazpath" != "xNONE"; then
+		yazconfig=$yazpath/yaz-config
+	else
+		for i in ../yaz* ../yaz; do
+			if test -d $i; then
+				if test -r $i/yaz-config; then
+					yazconfig=$i/yaz-config
+				fi
+			fi
+		done
+		if test "x$yazconfig" = "xNONE"; then
+			AC_PATH_PROG(yazconfig, yaz-config, NONE)
+		fi
+	fi
+	AC_MSG_CHECKING(for YAZ)
+	if $yazconfig --version >/dev/null 2>&1; then
+		YAZLIB=`$yazconfig --libs`
+		# 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`
+			YAZVERSION=`$yazconfig --version`
+		fi
+		AC_MSG_RESULT($yazconfig)
+	else
+		AC_MSG_RESULT(Not found)
+		YAZVERSION=NONE
+	fi
+])
+	
+
-- 
1.7.10.4