projects
/
m4-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix boost not found on debian-testing MP-628
[m4-moved-to-github.git]
/
yaz.m4
diff --git
a/yaz.m4
b/yaz.m4
index
38117ce
..
22b57ce
100644
(file)
--- a/
yaz.m4
+++ b/
yaz.m4
@@
-4,14
+4,21
@@
dnl ----- Setup Docbook documentation for YAZ
AC_DEFUN([YAZ_DOC],
[
dnl ----- Setup Docbook documentation for YAZ
AC_DEFUN([YAZ_DOC],
[
+dnl autoconf < 2.60 does not define docdir
+if test -n "$docdir"; then
+ docdir="${datadir}/doc/${PACKAGE}"
+ AC_SUBST([docdir])
+fi
AC_SUBST(XSLTPROC_COMPILE)
AC_SUBST(XSLTPROC_COMPILE)
-XSLTPROC_COMPILE='xsltproc -path ".:$(srcdir)"'
+XSLTPROC_COMPILE='xsltproc --xinclude -path ".:$(srcdir)"'
AC_SUBST(MAN_COMPILE)
AC_SUBST(MAN_COMPILE)
-MAN_COMPILE='$(XSLTPROC_COMPILE) common/man.xsl'
+MAN_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.man.xsl'
AC_SUBST(HTML_COMPILE)
AC_SUBST(HTML_COMPILE)
-HTML_COMPILE='$(XSLTPROC_COMPILE) common/html.xsl'
+HTML_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.htmlhelp.xsl'
AC_SUBST(TKL_COMPILE)
AC_SUBST(TKL_COMPILE)
-TKL_COMPILE='$(XSLTPROC_COMPILE) common/tkl.xsl'
+TKL_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.tkl.xsl'
+AC_SUBST(PDF_COMPILE)
+PDF_COMPILE='dblatex -P latex.class.options=a4paper,12pt,twoside,openright'
AC_SUBST(DTD_DIR)
AC_ARG_WITH(docbook-dtd,[[ --with-docbook-dtd=DIR use docbookx.dtd in DIR]],
AC_SUBST(DTD_DIR)
AC_ARG_WITH(docbook-dtd,[[ --with-docbook-dtd=DIR use docbookx.dtd in DIR]],
@@
-140,9
+147,6
@@
AC_DEFUN([YAZ_INIT],
if test "$have_yaz_version" -lt "$req_yaz_version"; then
AC_MSG_ERROR([$YAZVERSION. Requires YAZ $2 or later])
fi
if test "$have_yaz_version" -lt "$req_yaz_version"; then
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"
- fi
fi
fi
])
fi
fi
])