X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=yazpp.m4;h=85121093da21cb3da0bec7ba367bc643e3d15112;hp=63be11e5131c745dff480dd2d4c5fc511160b555;hb=4e0e40e289553f9c52a921132da6e1746278d517;hpb=59bb175d89a8b050166b99b8f223ad5163835e55 diff --git a/yazpp.m4 b/yazpp.m4 index 63be11e..8512109 100644 --- a/yazpp.m4 +++ b/yazpp.m4 @@ -6,24 +6,24 @@ AC_DEFUN([YAZPP_INIT], AC_SUBST(YAZPPVERSION) yazppconfig=NONE yazpppath=NONE - AC_ARG_WITH(yazpp, [ --with-yazpp=DIR yaz++-config in DIR (example /home/yaz++-0.8)], [yazpppath=$withval]) + AC_ARG_WITH(yazpp, [ --with-yazpp=DIR yazpp-config in DIR (example /home/yazpp-1.0.0)], [yazpppath=$withval]) if test "x$yazpppath" != "xNONE"; then - yazppconfig=$yazpppath/yaz++-config + yazppconfig=$yazpppath/yazpp-config else if test "x$srcdir" = "x"; then yazppsrcdir=. else yazppsrcdir=$srcdir fi - for i in ${yazppsrcdir}/../../yaz++ ${yazppsrcdir}/../yaz++-* ${yazppsrcdir}/../yaz++; do + for i in ${yazppsrcdir}/../../yazpp ${yazppsrcdir}/../yazpp-* ${yazppsrcdir}/../yazpp; do if test -d $i; then - if test -r $i/yaz++-config; then - yazppconfig=$i/yaz++-config + if test -r $i/yazpp-config; then + yazppconfig=$i/yazpp-config fi fi done if test "x$yazppconfig" = "xNONE"; then - AC_PATH_PROG(yazppconfig, yaz++-config, NONE) + AC_PATH_PROG(yazppconfig, yazpp-config, NONE) fi fi AC_MSG_CHECKING(for YAZ++) @@ -44,7 +44,7 @@ AC_DEFUN([YAZPP_INIT], 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]) + AC_MSG_ERROR([$YAZPPVERSION. Requires YAZ++ $2 or later]) fi fi fi