Added cs_get_SSL. yaz-client-ssl prints peer info

[yaz-moved-to-github.git] / yaz.m4

diff --git a/yaz.m4 b/yaz.m4
index f90e14c..5d7e86d 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,4 +1,4 @@
-## $Id: yaz.m4,v 1.3 2001-03-26 14:42:37 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.
@@ -21,7 +21,7 @@ AC_DEFUN([YAZ_INIT],
                else
                        yazsrcdir=$srcdir
                fi
-               for i in ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz; do
+               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
@@ -44,10 +44,20 @@ 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
+               fi
+       fi
+])