X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz.m4;h=ebfd7747456ad4f5ed8746d1e23a400d05109d62;hb=f2cd22a0392a33d93f03a69f7f7687afd804b3de;hp=357300c251da7890d9e257f778e777207a6a154e;hpb=e68f7cbba423d2bbc00929a812ef186dd226e91a;p=m4-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index 357300c..ebfd774 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -4,6 +4,15 @@
 dnl ----- Setup Docbook documentation for YAZ
 AC_DEFUN([YAZ_DOC],
 [
+AC_SUBST(XSLTPROC_COMPILE)
+XSLTPROC_COMPILE='xsltproc -path ".:$(srcdir)"'
+AC_SUBST(MAN_COMPILE)
+MAN_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.man.xsl'
+AC_SUBST(HTML_COMPILE)
+HTML_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.htmlhelp.xsl'
+AC_SUBST(TKL_COMPILE)
+TKL_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.tkl.xsl'
+
 AC_SUBST(DTD_DIR)	
 AC_ARG_WITH(docbook-dtd,[[  --with-docbook-dtd=DIR  use docbookx.dtd in DIR]],
 [
@@ -17,7 +26,7 @@ AC_ARG_WITH(docbook-dtd,[[  --with-docbook-dtd=DIR  use docbookx.dtd in DIR]],
 		 /usr/share/sgml/docbook/dtd/4.2 \
 		 /usr/share/sgml/docbook/dtd/xml/4.* \
 		 /usr/share/sgml/docbook/xml-dtd-4.* \
-		/usr/local/share/xml/docbook/4.1.2
+		/usr/local/share/xml/docbook/4.*
 	do
 		if test -f $d/docbookx.dtd; then
 			DTD_DIR=$d
@@ -62,6 +71,7 @@ AC_ARG_WITH(docbook-xsl,[[  --with-docbook-xsl=DIR  use Docbook XSL in DIR/{html
 ],[
 	AC_MSG_CHECKING(for htmlhelp.xsl)
 	for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+		/usr/local/share/xsl/docbook \
 		/usr/share/sgml/docbook/xsl-stylesheets-1.* 
 	do
 		if test -f $d/htmlhelp/htmlhelp.xsl; then