Omit result about xml2-config

[m4-moved-to-github.git] / yaz.m4

diff --git a/yaz.m4 b/yaz.m4
index 796738e..eebfa70 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -4,6 +4,20 @@
 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)
+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]],
 [
@@ -16,7 +30,8 @@ AC_ARG_WITH(docbook-dtd,[[  --with-docbook-dtd=DIR  use docbookx.dtd in DIR]],
        for d in /usr/lib/sgml/dtd/docbook-xml \
                 /usr/share/sgml/docbook/dtd/4.2 \
                 /usr/share/sgml/docbook/dtd/xml/4.* \
-                /usr/share/sgml/docbook/xml-dtd-4.* 
+                /usr/share/sgml/docbook/xml-dtd-4.* \
+               /usr/local/share/xml/docbook/4.*
        do
                if test -f $d/docbookx.dtd; then
                        DTD_DIR=$d
@@ -39,7 +54,8 @@ AC_ARG_WITH(docbook-dsssl,[[  --with-docbook-dsssl=DIR use Docbook DSSSL in DIR/
        DSSSL_DIR=""
        for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
                /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-               /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
+               /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh \
+               /usr/local/share/sgml/docbook/dsssl/modular
        do
                if test -f $d/html/docbook.dsl; then
                        AC_MSG_RESULT($d)
@@ -60,6 +76,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
@@ -91,7 +108,7 @@ AC_DEFUN([YAZ_INIT],
                else
                        yazsrcdir=$srcdir
                fi
-               for i in ${yazsrcdir}/../../yaz ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz; do
+               for i in ${yazsrcdir}/../../yaz ${yazsrcdir}/../yaz-* ${yazsrcdir}/../yaz; do
                        if test -d $i; then
                                if test -r $i/yaz-config; then
                                        yazconfig=$i/yaz-config