Log Message:
-----------
Only check for document-tools when --with-docs=yes is actually 
specified. The option defaults to no. 

Before this patch the documents were only build if --with-docs=yes was
specified, but the checks were carried out regardless of the value.

Modified Files:
--------------
    slony1-engine:
        configure.ac (r1.50 -> r1.51)
    slony1-engine/config:
        docs.m4 (r1.10 -> r1.11)

-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.50
retrieving revision 1.51
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.50 -r1.51
--- configure.ac
+++ configure.ac
@@ -131,6 +131,8 @@
 AC_ARG_WITH(netsnmp,            [  --with-netsnmp=<dir>             Enable snmp support <dir> is the location of net-snmp-config. **EXPERIMENTAL** ])
 AC_ARG_WITH(perltools,          [  --with-perltools=<dir>           Location to install the perl management tools Default $PREFIX/bin. ])
 AC_ARG_WITH(docdir,		[  --with-docdir=<dir>              Location to install all the documentation Default is $PREFIX/doc. ])
+AC_ARG_WITH(docs,		[  --with-docs=<yes|no>             Build the sgml documentation [default=no]])
+
 #Our current path
 SLONYPATH=`pwd`
 
@@ -140,8 +142,6 @@
 ACX_LIBPQ()
 ACX_LIBSNMP()
 ACX_SLONYTOOLS()
-SLON_AC_DOCS()
-ACX_SLONYDOCS()
 
 AC_SUBST(PGINCLUDEDIR, $PG_INCLUDEDIR)
 AC_SUBST(PGINCLUDESERVERDIR, $PG_INCLUDESERVERDIR)
@@ -154,7 +154,6 @@
 AC_SUBST(NETSNMP_AGENTLIBS, $NETSNMP_AGENTLIBS)
 AC_SUBST(TOOLSBIN, $TOOLSBIN)
 AC_SUBST(DOCDIR, $DOCDIR)
-AC_SUBST(with_docs, $with_docs)
 
 AC_SUBST(SLONYPATH)
 AC_SUBST(HOST_OS,$host_os)
@@ -168,6 +167,19 @@
 AC_SUBST(SLONBINDIR,$SLONBINDIR)
 
 # ----
+# Documentation checks
+# ----
+SLON_AC_DOCS()
+ACX_SLONYDOCS()
+
+AC_SUBST(with_docs, $with_docs)
+
+AC_MSG_CHECKING(if you have requested documentation building)
+if test "$with_docs" = "yes"; then
+
+	AC_MSG_RESULT($with_docs)
+
+	# ----
 # Tools for building docs
 # ---
 
@@ -187,6 +199,9 @@
 SLON_AC_PATH_DOCBOOK_STYLESHEETS
 SLON_AC_PATH_COLLATEINDEX
 AC_SUBST(SGMLSPL, $SGMLSPL)
+else
+  AC_MSG_RESULT(no)
+fi
 
 AC_CONFIG_FILES([
 	Makefile.global GNUmakefile
Index: docs.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docs.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lconfig/docs.m4 -Lconfig/docs.m4 -u -w -r1.10 -r1.11
--- config/docs.m4
+++ config/docs.m4
@@ -44,15 +44,5 @@
   AC_LANG_RESTORE
 ]) dnl ACX_SLONYDOCS
 
-AC_DEFUN([SLON_AC_DOCS],
-[AC_ARG_WITH(docs,
-[  --with-docs             Build the sgml documentation [default=no]],
-test "$withval" = no || with_docs=yes, with_docs=no)
-AC_MSG_CHECKING(if you have requested documentation building)
-if test -n "$with_docs"; then
-  AC_MSG_RESULT($with_docs)
-else
-  AC_MSG_RESULT(no)
-fi
-])
+AC_DEFUN([SLON_AC_DOCS])