Log Message:
-----------
Changes to have slony build a bit better on Tru64

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.16 -> r1.17)
        configure (r1.27 -> r1.28)
        configure.ac (r1.32 -> r1.33)
    slony1-engine/config:
        acx_pthread.m4 (r1.1 -> r1.2)
        docs.m4 (r1.1 -> r1.2)
    slony1-engine/makefiles:
        Makefile.osf (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.16 -r1.17
--- Makefile.global.in
+++ Makefile.global.in
@@ -50,7 +50,9 @@
 override CPPFLAGS := -I$(top_builddir) -I${pgincludedir} -I${pgincludeserverdir} $(CPPFLAGS)
 LDFLAGS =   -L${pglibdir} -L${pgpkglibdir} -lpq
 
+ifeq ($(GCC), yes)
 CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
+endif
 
 # Installation.
 
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.32 -r1.33
--- configure.ac
+++ configure.ac
@@ -119,7 +119,6 @@
 # ----
 # Tools for building docs
 # ---
-#SLON_DOCS()
 
 AC_SUBST(GROFF)
 AC_SUBST(PS2PDF)
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lconfigure -Lconfigure -u -w -r1.27 -r1.28
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for postgresql-slony1-engine HEAD_20040828.
+# Generated by GNU Autoconf 2.57 for postgresql-slony1-engine HEAD_20040902.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -266,8 +266,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20040828'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20040828'
+PACKAGE_VERSION='HEAD_20040902'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20040902'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -308,7 +308,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LEX LEXLIB LEX_OUTPUT_ROOT YACC LD YFLAGS LEXFLAGS with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR SLONYPATH HOST_OS PORTNAME LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LEX LEXLIB LEX_OUTPUT_ROOT YACC LD YFLAGS LEXFLAGS with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR SLONYPATH HOST_OS PORTNAME GROFF PS2PDF DJPEG PNMTOPS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -777,7 +777,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_20040828 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20040902 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -838,7 +838,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20040828:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20040902:";;
    esac
   cat <<\_ACEOF
 
@@ -928,7 +928,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20040828
+postgresql-slony1-engine configure HEAD_20040902
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -943,7 +943,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_20040828, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20040902, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -3084,6 +3084,9 @@
         :
 else
         acx_pthread_ok=no
+	{ { echo "$as_me:$LINENO: error: Slony-I requires pthreads. You must have a working pthreads implementation" >&5
+echo "$as_me: error: Slony-I requires pthreads. You must have a working pthreads implementation" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 ac_ext=c
@@ -5040,6 +5043,7 @@
 # Locate PostgreSQL paths
 # ----
 
+
 # Check whether --with-pgconfigdir or --without-pgconfigdir was given.
 if test "${with_pgconfigdir+set}" = set; then
   withval="$with_pgconfigdir"
@@ -5925,13 +5929,22 @@
 
 PGBINDIR=$PG_BINDIR
 
-SLONYPATH=$SLONYPATH
 
 HOST_OS=$host_os
 
 PORTNAME=$template
 
 
+# ----
+# Tools for building docs
+# ---
+
+
+
+
+
+
+
                     ac_config_files="$ac_config_files Makefile.global GNUmakefile"
 
 
@@ -6296,7 +6309,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20040828, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20040902, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6356,7 +6369,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20040828
+postgresql-slony1-engine config.status HEAD_20040902
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -6586,6 +6599,10 @@
 s, at SLONYPATH@,$SLONYPATH,;t t
 s, at HOST_OS@,$HOST_OS,;t t
 s, at PORTNAME@,$PORTNAME,;t t
+s, at GROFF@,$GROFF,;t t
+s, at PS2PDF@,$PS2PDF,;t t
+s, at DJPEG@,$DJPEG,;t t
+s, at PNMTOPS@,$PNMTOPS,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
Index: docs.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docs.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig/docs.m4 -Lconfig/docs.m4 -u -w -r1.1 -r1.2
--- config/docs.m4
+++ config/docs.m4
@@ -1,8 +1,4 @@
-dnl Checking for documentation tools.
-dnl
 
-AC_DEFUN([SLON_DOCS], [
-AC_LANG_SAVE
 AC_PATH_PROG(GROFF,groff)
 if test "x$GROFF" != x; then
   GROFF="$GROFF -U -t -p -ms -mpspic"
@@ -12,7 +8,3 @@
 AC_PATH_PROG(DJPEG, djpeg)
 AC_PATH_PROG(PNMTOPS, pnmtops)
 
-AC_LANG_RESTORE
-
-])
-
Index: acx_pthread.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_pthread.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig/acx_pthread.m4 -Lconfig/acx_pthread.m4 -u -w -r1.1 -r1.2
--- config/acx_pthread.m4
+++ config/acx_pthread.m4
@@ -193,6 +193,7 @@
         :
 else
         acx_pthread_ok=no
+	AC_ERROR(Slony-I requires pthreads. You must have a working pthreads implementation)
         $2
 fi
 AC_LANG_RESTORE
Index: Makefile.osf
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.osf,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmakefiles/Makefile.osf -Lmakefiles/Makefile.osf -u -w -r1.4 -r1.5
--- makefiles/Makefile.osf
+++ makefiles/Makefile.osf
@@ -1,3 +1,5 @@
+INCLUDE += -I/usr/include
+
 AROPT = crs
 DLSUFFIX = .so
 CFLAGS_SL =