From 84d0e77ec401bb5c245502fc3c0d44864025fb9c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 30 Apr 2004 19:35:30 +0000
Subject: [PATCH] Use YAZ_DOC macro to setup documentation.

---
 NEWS         |    2 ++
 configure.in |   50 +------------------------------------
 yaz.m4       |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/NEWS b/NEWS
index 3b7797f..28047a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 
+Use YAZ_DOC macro to setup documentation.
+
 --- 0.8 2004/04/23
 
 Proxy now a separate project. See http://indexdata.dk/yazproxy/
diff --git a/configure.in b/configure.in
index dcef686..2620e8a 100644
--- a/configure.in
+++ b/configure.in
@@ -9,55 +9,7 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
 YAZ_INIT(threads,2.0.12)
-dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]          use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbookx.dtd)
-   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(dsssl,[  --with-dsssl[=DIR]        use 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)
-   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
-])
-dnl 
+YAZ_DOC
 
 AC_ARG_ENABLE(zoom,[  --disable-zoom          disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes])
 AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes")
diff --git a/yaz.m4 b/yaz.m4
index 05ae608..ddd1cdd 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,8 +1,7 @@
-## $Id: yaz.m4,v 1.6 2004-02-05 14:18:34 adam Exp $
+## $Id: yaz.m4,v 1.7 2004-04-30 19:35:30 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
 
 AC_DEFUN([YAZ_INIT],
 [
@@ -61,3 +60,77 @@ AC_DEFUN([YAZ_INIT],
 		fi
 	fi
 ]) 
+
+dnl ----- Setup Docbook documentation for YAZ
+AC_DEFUN([YAZ_DOC],
+[
+AC_SUBST(DTD_DIR)	
+AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
+[
+	if test -f "$withval/docbookx.dtd"; then
+		DTD_DIR=$withva	l
+	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(dsssl,[  --with-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(xsl,[  --with-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
+])
+]) 
-- 
1.7.10.4