1.4.1.

[ir-tcl-moved-to-github.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 20a20a7..21d4822 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,15 @@
-## $Id: aclocal.m4,v 1.1 2000-10-11 12:26:47 adam Exp $
-## 
+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 # Use this m4 funciton for autoconf if you use YAZ in your own
 # configure script.
 # YAZ_INIT
@@ -16,7 +26,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 ../yaz* ../yaz; do
                        if test -d $i; then
                                if test -r $i/yaz-config; then
                                        yazconfig=$i/yaz-config
@@ -29,14 +44,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)
@@ -46,3 +61,4 @@ AC_DEFUN([YAZ_INIT],
        fi
 ])
        
+