Log Message:
-----------
More docbook fixes, detect the correct version of docbook (4.2)

Modified Files:
--------------
    slony1-engine/config:
        docbook.m4 (r1.2 -> r1.3)
        docs.m4 (r1.3 -> r1.4)
    slony1-engine:
        aclocal.m4 (r1.5 -> r1.6)
        configure.ac (r1.37 -> r1.38)

-------------- next part --------------
Index: docs.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docs.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lconfig/docs.m4 -Lconfig/docs.m4 -u -w -r1.3 -r1.4
--- config/docs.m4
+++ config/docs.m4
@@ -16,3 +16,5 @@
 AC_DEFUN([SLON_AC_PROG_PNMTOPS],
 [AC_CHECK_PROGS([PNMTOPS], [pnmtops])])
 
+AC_DEFUN([SLON_AC_PROG_PGAUTODOC],
+[AC_CHECK_PROGS([PGAUTODOC],[postgresql_autodoc pgautodoc])])
Index: docbook.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docbook.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lconfig/docbook.m4 -Lconfig/docbook.m4 -u -w -r1.2 -r1.3
--- config/docbook.m4
+++ config/docbook.m4
@@ -1,3 +1,5 @@
+# $Id$
+
 # SLON_AC_PROG_JADE
 # --------------
 AC_DEFUN([SLON_AC_PROG_JADE],
@@ -14,7 +16,7 @@
 # ---------------------------
 AC_DEFUN([SLON_AC_CHECK_DOCBOOK],
 [AC_REQUIRE([SLON_AC_PROG_NSGMLS])
-AC_CACHE_CHECK([for DocBook V$1], [slon_ac_cv_check_docbook],
+AC_CACHE_CHECK([for DocBook V$1], [slonac_cv_check_docbook],
 [cat >conftest.sgml <<EOF
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V$1//EN">
 <book>
@@ -29,17 +31,17 @@
 </book>
 EOF
 
-slon_ac_cv_check_docbook=no
+slonac_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
+    slonac_cv_check_docbook=yes
   fi
 fi
 rm -f conftest.sgml])
 
-have_docbook=$slon_ac_cv_check_docbook
+have_docbook=$slonac_cv_check_docbook
 AC_SUBST([have_docbook])
 ])# SLON_AC_CHECK_DOCBOOK
 
@@ -49,37 +51,38 @@
 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],
+AC_CACHE_VAL([slonac_cv_path_stylesheets],
 [if test -n "$DOCBOOKSTYLE"; then
-  slon_ac_cv_path_stylesheets=$DOCBOOKSTYLE
+  slonac_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 \
+  for slonac_prefix in /usr /usr/local /opt; do
+    for slonac_infix in share lib; do
+      for slonac_postfix in \
         sgml/stylesheets/nwalsh-modular \
         sgml/stylesheets/docbook \
+	sgml/docbook-dsssl \
         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"
+        slonac_candidate=$slonac_prefix/$slonac_infix/$slonac_postfix
+        if test -r "$slonac_candidate/html/docbook.dsl" \
+           && test -r "$slonac_candidate/print/docbook.dsl"
         then
-          slon_ac_cv_path_stylesheets=$pgac_candidate
+          slonac_cv_path_stylesheets=$slonac_candidate
           break 3
         fi
       done
     done
   done
 fi])
-DOCBOOKSTYLE=$slon_ac_cv_path_stylesheets
+DOCBOOKSTYLE=$slonac_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
+fi])# SLON_C_PATH_DOCBOOK_STYLESHEETS
 
 
 # SLON_AC_PATH_COLLATEINDEX
@@ -91,4 +94,4 @@
                 [$DOCBOOKSTYLE/bin $PATH])
 else
   AC_PATH_PROGS(COLLATEINDEX, collateindex.pl)
-fi])# SLON_AC_PATH_COLLATEINDEX
+fi])# PGAC_PATH_COLLATEINDEX
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.37 -r1.38
--- configure.ac
+++ configure.ac
@@ -133,13 +133,14 @@
 SLON_AC_PROG_PS2PDF
 SLON_AC_PROG_DJPEG
 SLON_AC_PROG_PNMTOPS
+SLON_AC_PROG_PGAUTODOC
 
 #
 # Check for DocBook and tools
 #
 SLON_AC_PROG_NSGMLS
 SLON_AC_PROG_JADE
-SLON_AC_CHECK_DOCBOOK(3.1)
+SLON_AC_CHECK_DOCBOOK(4.2)
 SLON_AC_PATH_DOCBOOK_STYLESHEETS
 SLON_AC_PATH_COLLATEINDEX
 AC_CHECK_PROGS(SGMLSPL, sgmlspl)
Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -Laclocal.m4 -Laclocal.m4 -u -w -r1.5 -r1.6
--- aclocal.m4
+++ aclocal.m4
@@ -1,7 +1,8 @@
 m4_include([config/general.m4])
 m4_include([config/libtool.m4])
+m4_include([config/compiler.m4])
 m4_include([config/acx_pthread.m4])
 m4_include([config/acx_libpq.m4])
-m4_include([config/compiler.m4])
 m4_include([config/docbook.m4])
 m4_include([config/docs.m4])
+