Log Message:
-----------
Make cbb's docbook stuff fit into our build env

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.17 -> r1.18)
        configure.ac (r1.33 -> r1.34)

Added Files:
-----------
    slony1-engine/config:
        docbook.m4 (r1.1)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.17 -r1.18
--- Makefile.global.in
+++ Makefile.global.in
@@ -30,10 +30,6 @@
 PTHREAD_CC=		@PTHREAD_CC@
 YACC=			@YACC@
 FLEX=			@LEX@
-GROFF=			@GROFF@
-PS2PDF=			@PS2PDF@
-DJPEG=			@DJPEG@
-PNMTOPS=		@PNMTOPS@
 
 #build tool flags
 CFLAGS=			@CFLAGS@
@@ -44,6 +40,15 @@
 #libs
 PTHREAD_LIBS=		@PTHREAD_LIBS@
 
+# Documentation
+
+JADE    = @JADE@
+NSGMLS  = @NSGMLS@
+SGMLSPL = @SGMLSPL@
+PS2PDF  = @PS2PDF@
+DJPEG   = @DJPEG@
+GROFF	= @GROFF@
+PNMTOPS = @PNMTOPS@
 
 subdir=$(slony_subdir)
 
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.33 -r1.34
--- configure.ac
+++ configure.ac
@@ -125,6 +125,17 @@
 AC_SUBST(DJPEG)
 AC_SUBST(PNMTOPS)
 
+#
+# Check for DocBook and tools
+#
+SLON_AC_PROG_NSGMLS
+SLON_AC_PROG_JADE
+SLON_AC_CHECK_DOCBOOK(3.1)
+SLON_AC_PATH_DOCBOOK_STYLESHEETS
+SLON_AC_PATH_COLLATEINDEX
+AC_CHECK_PROGS(SGMLSPL, sgmlspl)
+
+
 
 AC_CONFIG_FILES([
 	Makefile.global GNUmakefile
--- /dev/null
+++ config/docbook.m4
@@ -0,0 +1,94 @@
+# SLON_AC_PROG_JADE
+# --------------
+AC_DEFUN([SLON_AC_PROG_JADE],
+[AC_CHECK_PROGS([JADE], [openjade jade])])
+
+
+# SLON_AC_PROG_NSGMLS
+# ----------------
+AC_DEFUN([SLON_AC_PROG_NSGMLS],
+[AC_CHECK_PROGS([NSGMLS], [onsgmls nsgmls])])
+
+
+# SLON_AC_CHECK_DOCBOOK(VERSION)
+# ---------------------------
+AC_DEFUN([SLON_AC_CHECK_DOCBOOK],
+[AC_REQUIRE([SLON_AC_PROG_NSGMLS])
+AC_CACHE_CHECK([for DocBook V$1], [slon_ac_cv_check_docbook],
+[cat >conftest.sgml <<EOF
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V$1//EN">
+<book>
+ <title>test</title>
+ <chapter>
+  <title>random</title>
+   <sect1>
+    <title>testsect</title>
+    <para>text</para>
+  </sect1>
+ </chapter>
+</book>
+EOF
+
+slon_ac_cv_check_docbook=no
+
+if test -n "$NSGMLS"; then
+  $NSGMLS -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1
+  if test $? -eq 0; then
+    slon_ac_cv_check_docbook=yes
+  fi
+fi
+rm -f conftest.sgml])
+
+have_docbook=$slon_ac_cv_check_docbook
+AC_SUBST([have_docbook])
+])# SLON_AC_CHECK_DOCBOOK
+
+
+# SLON_AC_PATH_DOCBOOK_STYLESHEETS
+# -----------------------------
+AC_DEFUN([SLON_AC_PATH_DOCBOOK_STYLESHEETS],
+[AC_ARG_VAR(DOCBOOKSTYLE, [location of DocBook stylesheets])dnl
+AC_MSG_CHECKING([for DocBook stylesheets])
+AC_CACHE_VAL([slon_ac_cv_path_stylesheets],
+[if test -n "$DOCBOOKSTYLE"; then
+  slon_ac_cv_path_stylesheets=$DOCBOOKSTYLE
+else
+  for slon_ac_prefix in /usr /usr/local /opt; do
+    for slon_ac_infix in share lib; do
+      for slon_ac_postfix in \
+        sgml/stylesheets/nwalsh-modular \
+        sgml/stylesheets/docbook \
+        sgml/docbook/dsssl/modular \
+        sgml/docbook/stylesheet/dsssl/modular \
+        sgml/docbook/dsssl-stylesheets
+      do
+        slon_ac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
+        if test -r "$pgac_candidate/html/docbook.dsl" \
+           && test -r "$pgac_candidate/print/docbook.dsl"
+        then
+          slon_ac_cv_path_stylesheets=$pgac_candidate
+          break 3
+        fi
+      done
+    done
+  done
+fi])
+DOCBOOKSTYLE=$slon_ac_cv_path_stylesheets
+AC_SUBST([DOCBOOKSTYLE])
+if test -n "$DOCBOOKSTYLE"; then
+  AC_MSG_RESULT([$DOCBOOKSTYLE])
+else
+  AC_MSG_RESULT(no)
+fi])# SLON_AC_PATH_DOCBOOK_STYLESHEETS
+
+
+# SLON_AC_PATH_COLLATEINDEX
+# ----------------------
+AC_DEFUN([SLON_AC_PATH_COLLATEINDEX],
+[AC_REQUIRE([SLON_AC_PATH_DOCBOOK_STYLESHEETS])dnl
+if test -n "$DOCBOOKSTYLE"; then
+  AC_PATH_PROGS(COLLATEINDEX, collateindex.pl, [],
+                [$DOCBOOKSTYLE/bin $PATH])
+else
+  AC_PATH_PROGS(COLLATEINDEX, collateindex.pl)
+fi])# PGAC_PATH_COLLATEINDEX