X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz.m4;h=22b57cecbd4038b04e3427f38225bb75f946d4c6;hb=cbe5631365b3ef5a840942cab5e03a50a665fe07;hp=a15d78ea4ebef706017a0d4ea20ee7c51945b646;hpb=5735869e4c19c4446dacc1267695a689dd4eed0a;p=m4-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index a15d78e..22b57ce 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -4,8 +4,22 @@
 dnl ----- Setup Docbook documentation for YAZ
 AC_DEFUN([YAZ_DOC],
 [
-AC_CHECK_PROGS(DB2MAN_PROG,docbook2man docbook-to-man,None)
-DB2MAN_PROG="\$(srcdir)/common/${DB2MAN_PROG}.sh"
+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)
+XSLTPROC_COMPILE='xsltproc --xinclude -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(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]],
 [
@@ -64,6 +78,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
@@ -132,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 "$req_yaz_version" -gt "2000028"; then
-				YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
-			fi
 		fi
 	fi
 ])