dd autoconf m4 macro YAZ_DOC for YAZ documentation setup (docbook).

diff --git a/NEWS b/NEWS
index 49988c1..aa92ec3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
 Possible compatibility problems with earlier versions marked with '*'.
 

+Add autoconf m4 macro YAZ_DOC for YAZ documentation setup (docbook).
+

 SSL comstack now uses yaz.pem certificate file on server side
 by default. Certificate filename can be configured by calling
 comstack function cs_set_ssl_cert before cs_bind is used.
 SSL comstack now uses yaz.pem certificate file on server side
 by default. Certificate filename can be configured by calling
 comstack function cs_set_ssl_cert before cs_bind is used.

diff --git a/buildconf.sh b/buildconf.sh
index f8ec56c..92b9fab 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: buildconf.sh,v 1.18 2004-02-17 10:29:51 adam Exp $
+# $Id: buildconf.sh,v 1.19 2004-04-30 19:34:05 adam Exp $

 set -x
 set -x

-aclocal
+aclocal -I .

 libtoolize --automake --force 
 automake --add-missing 
 automake --add-missing 
 libtoolize --automake --force 
 automake --add-missing 
 automake --add-missing 

diff --git a/configure.in b/configure.in
index 084c528..d1e0474 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.

-dnl $Id: configure.in,v 1.137 2004-04-28 22:44:58 adam Exp $
+dnl $Id: configure.in,v 1.138 2004-04-30 19:34:05 adam Exp $

 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE

@@ -17,74 +17,7 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfig, pkg-config, NONE)
 dnl
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfig, pkg-config, NONE)
 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 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)
-   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
-])
+YAZ_DOC

 dnl 
 dnl ----- Sockets
 checkBoth=0
 dnl 
 dnl ----- Sockets
 checkBoth=0

diff --git a/yaz.m4 b/yaz.m4
index 5d7e86d..283d266 100644 (file)
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,8 +1,7 @@
-## $Id: yaz.m4,v 1.6 2004-02-05 14:15:42 adam Exp $
+## $Id: yaz.m4,v 1.7 2004-04-30 19:34:05 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.
 # configure script.

-# YAZ_INIT

 
 AC_DEFUN([YAZ_INIT],
 [
 
 AC_DEFUN([YAZ_INIT],
 [

@@ -61,3 +60,77 @@ AC_DEFUN([YAZ_INIT],
                fi
        fi
 ]) 
                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
+])
+])