projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid Dollar ID
[yazpp-moved-to-github.git]
/
yazpp.m4
diff --git
a/yazpp.m4
b/yazpp.m4
index
468236e
..
a528936
100644
(file)
--- a/
yazpp.m4
+++ b/
yazpp.m4
@@
-1,4
+1,3
@@
-## $Id: yazpp.m4,v 1.1 2002-11-14 14:41:07 adam Exp $
AC_DEFUN([YAZPP_INIT],
[
AC_SUBST(YAZPPLIB)
AC_DEFUN([YAZPP_INIT],
[
AC_SUBST(YAZPPLIB)
@@
-7,7
+6,7
@@
AC_DEFUN([YAZPP_INIT],
AC_SUBST(YAZPPVERSION)
yazppconfig=NONE
yazpppath=NONE
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
if test "x$yazpppath" != "xNONE"; then
yazppconfig=$yazpppath/yaz++-config
else
@@
-16,7
+15,7
@@
AC_DEFUN([YAZPP_INIT],
else
yazppsrcdir=$srcdir
fi
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
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
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++)
fi
fi
AC_MSG_CHECKING(for YAZ++)