X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yazpp.m4;h=63be11e5131c745dff480dd2d4c5fc511160b555;hb=eea2caea1263bed0aae268f72d985cbb1822ac30;hp=468236ee5f7191e6f9b9281387320800f47af256;hpb=b5df64a7419369d341107d57fed288584016a843;p=yazpp-moved-to-github.git

diff --git a/yazpp.m4 b/yazpp.m4
index 468236e..63be11e 100644
--- a/yazpp.m4
+++ b/yazpp.m4
@@ -1,4 +1,3 @@
-## $Id: yazpp.m4,v 1.1 2002-11-14 14:41:07 adam Exp $
 AC_DEFUN([YAZPP_INIT],
 [
         AC_SUBST(YAZPPLIB)
@@ -7,7 +6,7 @@ AC_DEFUN([YAZPP_INIT],
         AC_SUBST(YAZPPVERSION)
         yazppconfig=NONE
         yazpppath=NONE
-        AC_ARG_WITH(yazppconfig, [  --with-yazppconfig=DIR  yaz++-config in DIR (example /home/yaz++-0.5)], [yazpppath=$withval])
+        AC_ARG_WITH(yazpp, [  --with-yazpp=DIR        yaz++-config in DIR (example /home/yaz++-0.8)], [yazpppath=$withval])
         if test "x$yazpppath" != "xNONE"; then
                 yazppconfig=$yazpppath/yaz++-config
         else
@@ -16,7 +15,7 @@ AC_DEFUN([YAZPP_INIT],
                 else
                         yazppsrcdir=$srcdir
                 fi
-                for i in ${yazppsrcdir}/../yaz++-* ${yazppsrcdir}/../yaz++; do
+                for i in ${yazppsrcdir}/../../yaz++ ${yazppsrcdir}/../yaz++-* ${yazppsrcdir}/../yaz++; do
                         if test -d $i; then
                                 if test -r $i/yaz++-config; then
                                         yazppconfig=$i/yaz++-config
@@ -24,7 +23,7 @@ AC_DEFUN([YAZPP_INIT],
                         fi
                 done
                 if test "x$yazppconfig" = "xNONE"; then
-                        AC_PATH_PROG(yazppconfig, yaz-config, NONE)
+                        AC_PATH_PROG(yazppconfig, yaz++-config, NONE)
                 fi
         fi
         AC_MSG_CHECKING(for YAZ++)
@@ -38,5 +37,16 @@ AC_DEFUN([YAZPP_INIT],
                 AC_MSG_RESULT(Not found)
                 YAZVERSION=NONE
         fi
+	if test "X$YAZPPVERSION" != "XNONE"; then
+		AC_MSG_CHECKING([for YAZ++ version])
+		AC_MSG_RESULT([$YAZPPVERSION])
+		if test "$2"; then
+			have_yaz_version=`echo "$YAZPPVERSION" | 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([$YAZPPVERSION. Requires $2 or later])
+			fi
+		fi
+	fi
 ])