Log Message:
-----------
Due to some distros having a conservitive default NAMELEN for sgml docs, I've made the building of the docs option when you type make all.  ./configure --with-docs will have them build with all.  *** Youc an still cd to doc/adminguide and do a make all there.

Modified Files:
--------------
    slony1-engine:
        GNUmakefile.in (r1.20 -> r1.21)
        configure (r1.47 -> r1.48)
        configure.ac (r1.46 -> r1.47)
    slony1-engine/config:
        docs.m4 (r1.6 -> r1.7)
    slony1-engine/doc/adminguide:
        Makefile (r1.12 -> r1.13)

-------------- next part --------------
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.20 -r1.21
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -30,9 +30,12 @@
 
 
 all:
-	@for subdir in src tools doc ; do \
+	@for subdir in src tools ; do \
 	  $(MAKE) -C $$subdir $@ || exit; \
     done && \
+	if [ "@with_docs@" = "yes" ]; then \
+		$(MAKE) -C doc $@ || exit; \
+	fi; \
 	echo "All of Slony-I is successfully made. Ready to install"
 
 install	installdirs:
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.46
retrieving revision 1.47
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.46 -r1.47
--- configure.ac
+++ configure.ac
@@ -140,6 +140,7 @@
 ACX_LIBPQ()
 ACX_LIBSNMP()
 ACX_SLONYTOOLS()
+SLON_AC_DOCS()
 ACX_SLONYDOCS()
 
 AC_SUBST(PGINCLUDEDIR, $PG_INCLUDEDIR)
@@ -153,6 +154,7 @@
 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)
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lconfigure -Lconfigure -u -w -r1.47 -r1.48
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20050510.
+# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20050530.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -254,8 +254,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20050510'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050510'
+PACKAGE_VERSION='HEAD_20050530'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20050530'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -764,7 +764,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures postgresql-slony1-engine HEAD_20050510 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20050530 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -825,7 +825,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050510:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050530:";;
    esac
   cat <<\_ACEOF
 
@@ -848,6 +848,7 @@
   --with-netsnmp=<dir>             Enable snmp support <dir> is the location of net-snmp-config. **EXPERIMENTAL**
   --with-perltools=<dir>           Location to install the perl management tools Default $PREFIX/bin.
   --with-docdir=<dir>              Location to install all the documentation Default is $PREFIX/doc.
+  --with-docs             Build the sgml documentation default=no
 
 Some influential environment variables:
   CC          C compiler command
@@ -925,7 +926,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20050510
+postgresql-slony1-engine configure HEAD_20050530
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -940,7 +941,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by postgresql-slony1-engine $as_me HEAD_20050510, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20050530, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -7905,6 +7906,22 @@
 
 
 
+# Check whether --with-docs or --without-docs was given.
+if test "${with_docs+set}" = set; then
+  withval="$with_docs"
+  test "$withval" = no || with_docs=yes
+else
+  with_docs=no
+fi;
+if test -n "$with_docs"; then
+  echo "$as_me:$LINENO: result: $with_docs" >&5
+echo "${ECHO_T}$with_docs" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
 
 
 
@@ -7958,6 +7975,8 @@
 
 DOCDIR=$DOCDIR
 
+with_docs=$with_docs
+
 
 
 HOST_OS=$host_os
@@ -8792,7 +8811,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050510, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20050530, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8851,7 +8870,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050510
+postgresql-slony1-engine config.status HEAD_20050530
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -9047,7 +9066,7 @@
 s, at LD@,$LD,;t t
 s, at YFLAGS@,$YFLAGS,;t t
 s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050510@,$HEAD_20050510,;t t
+s, at HEAD_20050530@,$HEAD_20050530,;t t
 s, at with_gnu_ld@,$with_gnu_ld,;t t
 s, at acx_pthread_config@,$acx_pthread_config,;t t
 s, at PTHREAD_CC@,$PTHREAD_CC,;t t
@@ -9066,6 +9085,7 @@
 s, at NETSNMP_AGENTLIBS@,$NETSNMP_AGENTLIBS,;t t
 s, at TOOLSBIN@,$TOOLSBIN,;t t
 s, at DOCDIR@,$DOCDIR,;t t
+s, at with_docs@,$with_docs,;t t
 s, at SLONYPATH@,$SLONYPATH,;t t
 s, at HOST_OS@,$HOST_OS,;t t
 s, at PORTNAME@,$PORTNAME,;t t
Index: docs.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docs.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lconfig/docs.m4 -Lconfig/docs.m4 -u -w -r1.6 -r1.7
--- config/docs.m4
+++ config/docs.m4
@@ -43,3 +43,14 @@
   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)
+if test -n "$with_docs"; then
+  AC_MSG_RESULT($with_docs)
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.12 -r1.13
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -18,7 +18,6 @@
 GENERATED_SGML = bookindex.sgml version.sgml
 
 ALLSGML = $(wildcard $(srcdir)/*.sgml) $(GENERATED_SGML)
-
 DISTFILES = $(ALLSGML) $(GENERATED_SGML)
 
 ifdef DOCBOOKSTYLE
@@ -69,9 +68,9 @@
 	$(mkinstalldirs) $(DOCDIR)/man$(DEFAULTSECTION)
 endif
 
-install: all man installdirs
+install: installdirs
 ifdef DOCDIR
-	for file in $(ALLSGML) ; do \
+	for file in $(wildcard $(srcdir)/*.sgml) ; do \
 	  $(INSTALL_DATA) $$file $(DOCDIR)/sgml; \
 	done
 	for file in $(wildcard man1/*) ; do \