X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz.m4;h=9626319ff02611bf61a0985936989a78f62f9adc;hb=1e58ebd4607490d810c7396a4e87eb70d9528166;hp=053c1ee47eca8b7128d80aaebf182466e3f8afbe;hpb=232b2a3c37fd4bdeb90a4a4613d081370599c625;p=idzebra-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index 053c1ee..9626319 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,8 +1,79 @@
-## $Id: yaz.m4,v 1.3 2001-03-29 19:48:00 adam Exp $
-## 
-# Use this m4 funciton for autoconf if you use YAZ in your own
+# Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
-# YAZ_INIT
+
+dnl ----- Setup Docbook documentation for YAZ
+AC_DEFUN([YAZ_DOC],
+[
+AC_SUBST(DTD_DIR)	
+AC_ARG_WITH(docbook-dtd, [  --with-docbook-dtd[=DIR]  use docbookx.dtd in DIR],
+[
+	if test -f "$withval/docbookx.dtd"; then
+		DTD_DIR=$withval
+	fi
+],[
+	AC_MSG_CHECKING(for docbookx.dtd)
+	DTD_DIR=""
+	for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
+		/usr/share/sgml/docbook/xml-dtd-4.1.2* \
+		/usr/share/sgml/docbook/xml-dtd-4.1 \
+		/usr/share/sgml/docbook/dtd/xml/4.0 \
+		/usr/lib/sgml/dtd/docbook-xml 
+	do
+		if test -f $d/docbookx.dtd; then
+			AC_MSG_RESULT($d)
+			DTD_DIR=$d
+			break
+		fi
+	done
+	if test -z "$DTD_DIR"; then
+		AC_MSG_RESULT(Not found)
+	fi
+])
+AC_SUBST(DSSSL_DIR)
+AC_ARG_WITH(docbook-dsssl,[  --with-docbook-dsssl[=DIR] use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
+[
+	if test -f "$withval/html/docbook.dsl"; then
+		DSSSL_DIR=$withval
+	fi
+],[
+	AC_MSG_CHECKING(for docbook.dsl)
+	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 
+	do
+		if test -f $d/html/docbook.dsl; then
+			AC_MSG_RESULT($d)
+			DSSSL_DIR=$d
+			break
+		fi
+	done
+	if test -z "$DSSSL_DIR"; then
+		AC_MSG_RESULT(Not found)
+	fi
+])
+AC_SUBST(XSL_DIR)
+AC_ARG_WITH(docbook-xsl,[  --with-docbook-xsl[=DIR]  use Docbook XSL in DIR/{htmlhelp,xhtml}],
+[
+	if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
+		XSL_DIR=$withval
+	fi
+],[
+	AC_MSG_CHECKING(for htmlhelp.xsl)
+	for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+		/usr/share/sgml/docbook/xsl-stylesheets-1.* 
+	do
+		if test -f $d/htmlhelp/htmlhelp.xsl; then
+			AC_MSG_RESULT($d)
+			XSL_DIR=$d
+			break
+		fi
+	done
+	if test -z "$XSL_DIR"; then
+		AC_MSG_RESULT(Not found)
+	fi
+])
+]) 
 
 AC_DEFUN([YAZ_INIT],
 [
@@ -12,7 +83,7 @@ AC_DEFUN([YAZ_INIT],
 	AC_SUBST(YAZVERSION)
 	yazconfig=NONE
 	yazpath=NONE
-	AC_ARG_WITH(yazconfig, [  --with-yazconfig=DIR    yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
+	AC_ARG_WITH(yaz, [  --with-yaz=DIR          use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
 	if test "x$yazpath" != "xNONE"; then
 		yazconfig=$yazpath/yaz-config
 	else
@@ -21,7 +92,7 @@ AC_DEFUN([YAZ_INIT],
 		else
 			yazsrcdir=$srcdir
 		fi
-		for i in ${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
@@ -44,10 +115,24 @@ AC_DEFUN([YAZ_INIT],
 			YAZINC=`$yazconfig --cflags $1`
 			YAZVERSION=`$yazconfig --version`
 		fi
-		AC_MSG_RESULT($yazconfig)
+		AC_MSG_RESULT([$yazconfig])
 	else
 		AC_MSG_RESULT(Not found)
 		YAZVERSION=NONE
 	fi
-])
-	
+	if test "X$YAZVERSION" != "XNONE"; then
+		AC_MSG_CHECKING([for YAZ version])
+		AC_MSG_RESULT([$YAZVERSION])
+		if test "$2"; then
+			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"
+			fi
+		fi
+	fi
+]) 
+