Added sortspec.

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

diff --git a/yaz.m4 b/yaz.m4
index bd6cf14..f90e14c 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,4 +1,4 @@
-## $Id: yaz.m4,v 1.1 2000-10-11 10:40:56 adam Exp $
+## $Id: yaz.m4,v 1.3 2001-03-26 14:42:37 adam Exp $
 ## 
 # Use this m4 funciton for autoconf if you use YAZ in your own
 # configure script.
@@ -16,7 +16,12 @@ AC_DEFUN([YAZ_INIT],
        if test "x$yazpath" != "xNONE"; then
                yazconfig=$yazpath/yaz-config
        else
-               for i in ../yaz* ../yaz; do
+               if test "x$srcdir" = "x"; then
+                       yazsrcdir=.
+               else
+                       yazsrcdir=$srcdir
+               fi
+               for i in ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz; do
                        if test -d $i; then
                                if test -r $i/yaz-config; then
                                        yazconfig=$i/yaz-config
@@ -29,14 +34,14 @@ AC_DEFUN([YAZ_INIT],
        fi
        AC_MSG_CHECKING(for YAZ)
        if $yazconfig --version >/dev/null 2>&1; then
-               YAZLIB=`$yazconfig --libs`
+               YAZLIB=`$yazconfig --libs $1`
                # 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`
+                       YAZLALIB=`$yazconfig --lalibs $1`
+                       YAZINC=`$yazconfig --cflags $1`
                        YAZVERSION=`$yazconfig --version`
                fi
                AC_MSG_RESULT($yazconfig)