X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=yazpp.m4;h=a5289361f49d37608879016ded1d203044e9dcb4;hb=aa1ce475fe15391b9a3d4644495199fb59ad2ca6;hp=85e839356a2ab5363d0acf147a02a3bcda68c2a4;hpb=2f1a9a4b28ae43c9da9e0740f84048065b2d3bf6;p=yazproxy-moved-to-github.git

diff --git a/yazpp.m4 b/yazpp.m4
index 85e8393..a528936 100644
--- a/yazpp.m4
+++ b/yazpp.m4
@@ -1,4 +1,3 @@
-## $Id: yazpp.m4,v 1.1 2004-04-11 11:36:46 adam Exp $
 AC_DEFUN([YAZPP_INIT],
 [
         AC_SUBST(YAZPPLIB)
@@ -7,7 +6,7 @@ AC_DEFUN([YAZPP_INIT],
         AC_SUBST(YAZPPVERSION)
         yazppconfig=NONE
         yazpppath=NONE
-        AC_ARG_WITH(yazppconfig, [  --with-yazppconfig=DIR  yaz++-config in DIR (example /home/yaz++-0.5)], [yazpppath=$withval])
+        AC_ARG_WITH(yazpp, [  --with-yazpp=DIR        yaz++-config in DIR (example /home/yaz++-0.8)], [yazpppath=$withval])
         if test "x$yazpppath" != "xNONE"; then
                 yazppconfig=$yazpppath/yaz++-config
         else
@@ -16,7 +15,7 @@ AC_DEFUN([YAZPP_INIT],
                 else
                         yazppsrcdir=$srcdir
                 fi
-                for i in ${yazppsrcdir}/../yaz++-* ${yazppsrcdir}/../yaz++; do
+                for i in ${yazppsrcdir}/../../yaz++ ${yazppsrcdir}/../yaz++-* ${yazppsrcdir}/../yaz++; do
                         if test -d $i; then
                                 if test -r $i/yaz++-config; then
                                         yazppconfig=$i/yaz++-config
@@ -24,7 +23,7 @@ AC_DEFUN([YAZPP_INIT],
                         fi
                 done
                 if test "x$yazppconfig" = "xNONE"; then
-                        AC_PATH_PROG(yazppconfig, yaz-config, NONE)
+                        AC_PATH_PROG(yazppconfig, yaz++-config, NONE)
                 fi
         fi
         AC_MSG_CHECKING(for YAZ++)