X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=yaz.m4;h=31311d3b38bcbf69408ea4f3619a2f987bbe33bc;hb=85fb4f09ae29b56f0c29ccf47af746c42168e3ac;hp=fbf53b6e0c0853ed7774e74aafd1d4073de128cd;hpb=15b0a8ff280a89593d09d320b841191cdd4cedf6;p=yazpp-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index fbf53b6..31311d3 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,5 +1,3 @@
-## $Id: yaz.m4,v 1.10 2004-09-09 09:55:10 adam Exp $
-## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
 
@@ -85,7 +83,7 @@ AC_DEFUN([YAZ_INIT],
 	AC_SUBST(YAZVERSION)
 	yazconfig=NONE
 	yazpath=NONE
-	AC_ARG_WITH(yaz-config, [  --with-yaz-config=DIR   use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
+	AC_ARG_WITH(yaz, [  --with-yaz=DIR          use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
 	if test "x$yazpath" != "xNONE"; then
 		yazconfig=$yazpath/yaz-config
 	else
@@ -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