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

diff --git a/yaz.m4 b/yaz.m4
index 2782a1d..22b57ce 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -4,6 +4,22 @@
 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 --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]],
 [
@@ -16,7 +32,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 +56,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 +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
@@ -91,7 +110,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
@@ -126,10 +145,7 @@ AC_DEFUN([YAZ_INIT],
 			have_yaz_version=`echo "$YAZVERSION" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
 			req_yaz_version=`echo "$2" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
 			if test "$have_yaz_version" -lt "$req_yaz_version"; then
-				AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
-			fi
-			if test "$req_yaz_version" -gt "2000028"; then
-				YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
+				AC_MSG_ERROR([$YAZVERSION. Requires YAZ $2 or later])
 			fi
 		fi
 	fi