If libexslt is not found, tell when pkg-config is missing

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

diff --git a/yaz.m4 b/yaz.m4
index 2782a1d..4815430 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -91,7 +91,7 @@ AC_DEFUN([YAZ_INIT],
                else
                        yazsrcdir=$srcdir
                fi
-               for i in ${yazsrcdir}/../../yaz ${yazsrcdir}/../yaz* ${yazsrcdir}/../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
@@ -126,7 +126,7 @@ AC_DEFUN([YAZ_INIT],
                        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])
+                               AC_MSG_ERROR([$YAZVERSION. Requires YAZ $2 or later])
                        fi
                        if test "$req_yaz_version" -gt "2000028"; then
                                YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"