Log Message:
-----------
Update configure to reflect all changes.

Modified Files:
--------------
    slony1-engine:
        configure (r1.62 -> r1.63)

-------------- next part --------------
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.62
retrieving revision 1.63
diff -Lconfigure -Lconfigure -u -w -r1.62 -r1.63
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050917.
+# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20051102.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20050917'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050917'
+PACKAGE_VERSION='HEAD_20051102'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20051102'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -309,7 +309,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 enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050917 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS NLSLIB PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR with_docs SLONYPATH HOST_OS PORTNAME SLONBINDIR GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL 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 enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20051102 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS NLSLIB PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR SLONYPATH HOST_OS PORTNAME SLONBINDIR with_docs GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -782,7 +782,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_20050917 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20051102 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -843,7 +843,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050917:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20051102:";;
    esac
   cat <<\_ACEOF
 
@@ -866,7 +866,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
+  --with-docs=<yes|no>             Build the sgml documentation default=no
 
 Some influential environment variables:
   CC          C compiler command
@@ -977,7 +977,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20050917
+postgresql-slony1-engine configure HEAD_20051102
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -991,7 +991,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_20050917, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20051102, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6081,6 +6081,13 @@
   withval="$with_docdir"
 
 fi;
+
+# Check whether --with-docs or --without-docs was given.
+if test "${with_docs+set}" = set; then
+  withval="$with_docs"
+
+fi;
+
 #Our current path
 SLONYPATH=`pwd`
 
@@ -6099,6 +6106,71 @@
 
 
 
+
+if test -n "${with_pgbindir}" ; then
+_pwd=`pwd`
+cd ${with_pgbindir}
+with_pgbindir=`pwd`
+cd ${_pwd}
+echo "overriding pgbindir with" ${with_pgbindir}
+PG_BINDIR=${with_pgbindir}
+fi
+
+if test -n "${with_pglibdir}"; then
+_pwd=`pwd`
+cd ${with_pglibdir}
+with_pglibdir=`pwd`
+cd ${_pwd}
+echo "overriding pglibdir with" ${with_pglibdir}
+PG_LIBDIR=${with_pglibdir}
+fi
+
+if test -n "${with_pgincludedir}"; then
+_pwd=`pwd`
+cd ${with_pgincludedir}
+with_pgincludedir=`pwd`
+cd ${_pwd}
+echo "overriding pgincludedir with" ${with_pgincludedir}
+PG_INCLUDEDIR=${with_pgincludedir}
+fi
+
+if test -n "${with_pgpkglibdir}"; then
+_pwd=`pwd`
+cd ${with_pgpkglibdir}
+with_pgpkglibdir=`pwd`
+cd ${_pwd}
+echo "overriding pgpkglibdir with" ${with_pgpkglibdir}
+PG_PKGLIBDIR=${with_pgpkglibdir}
+fi
+
+if test -n "${with_pgincludeserverdir}"; then
+_pwd=`pwd`
+cd ${with_pgincludeserverdir}
+with_pgincludeserverdir=`pwd`
+cd ${_pwd}
+echo "overriding pgincludeserverdir with" ${with_pgincludeserverdir}
+PG_INCLUDESERVERDIR=${with_pgincludeserverdir}
+fi
+
+if test -n "${with_toolsdir}"; then
+_pwd=`pwd`
+cd ${with_toolsdir}
+with_toolsdir=`pwd`
+cd ${_pwd}
+echo "overriding toolsdir with" ${with_toolsdir}
+TOOLSBINDIR=${with_toolsdir}
+fi
+
+if test -n "${with_pgsharedir}"; then
+_pwd=`pwd`
+cd ${with_pgsharedir}
+with_pgsharedir=`pwd`
+cd ${_pwd}
+echo "overriding pgsharedir with" ${with_pgsharedir}
+PG_SHAREDIR=${with_pgsharedir}
+fi
+
+
 echo "$as_me:$LINENO: checking for pg_config" >&5
 echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
 
@@ -6126,11 +6198,26 @@
             ;;
 
         *)
+	    if test "$PG_BINDIR" = ""; then
             PG_BINDIR=`$PG_CONFIG_LOCATION --bindir`/
+		echo "pg_config says pg_bindir is $PG_BINDIR"
+		fi
+            if test "$PG_LIBDIR" = ""; then
             PG_LIBDIR=`$PG_CONFIG_LOCATION --libdir`/
+		echo "pg_config says pg_libdir is $PG_LIBDIR"
+	    fi
+            if test "$PG_INCLUDEDIR" = ""; then
             PG_INCLUDEDIR=`$PG_CONFIG_LOCATION --includedir`/
+		echo "pg_config says pg_includedir is $PG_INCLUDEDIR"
+	    fi
+            if test "$PG_PKGLIBDIR" = ""; then
             PG_PKGLIBDIR=`$PG_CONFIG_LOCATION --pkglibdir`/
+		echo "pg_config says pg_pkglibdir is $PG_PKGLIBDIR"
+	    fi
+            if test "$PG_INCLUDESERVERDIR" = ""; then
             PG_INCLUDESERVERDIR=`$PG_CONFIG_LOCATION --includedir-server`/
+		echo "pg_config says pg_includeserverdir is $PG_INCLUDESERVERDIR"
+	    fi
             ;;
     esac
 
@@ -6207,62 +6294,6 @@
 
 
 
-if test -n "${with_pgbindir}" ; then
-_pwd=`pwd`
-cd ${with_pgbindir}
-with_pgbindir=`pwd`
-cd ${_pwd}
-echo "Overriding pgbindir with" ${with_pgbindir}
-PG_BINDIR=${with_pgbindir}
-fi
-
-if test -n "${with_pglibdir}"; then
-_pwd=`pwd`
-cd ${with_pglibdir}
-with_pglibdir=`pwd`
-cd ${_pwd}
-echo "Overriding pglibdir with" ${with_pglibdir}
-PG_LIBDIR=${with_pglibdir}
-fi
-
-if test -n "${with_pgincludedir}"; then
-_pwd=`pwd`
-cd ${with_pgincludedir}
-with_pgincludedir=`pwd`
-cd ${_pwd}
-echo "Overriding pgincludedir with" ${with_pgincludedir}
-PG_INCLUDEDIR=${with_pgincludedir}
-fi
-
-if test -n "${with_pgpkglibdir}"; then
-_pwd=`pwd`
-cd ${with_pgpkglibdir}
-with_pgpkglibdir=`pwd`
-cd ${_pwd}
-echo "Overriding pgpkglibdir with" ${with_pgpkglibdir}
-PG_PKGLIBDIR=${with_pgpkglibdir}
-fi
-
-if test -n "${with_pgincludeserverdir}"; then
-_pwd=`pwd`
-cd ${with_pgincludeserverdir}
-with_pgincludeserverdir=`pwd`
-cd ${_pwd}
-echo "Overriding pgincludeserverdir with" ${with_pgincludeserverdir}
-PG_INCLUDESERVERDIR=${with_pgincludeserverdir}
-fi
-
-if test -n "${with_toolsdir}"; then
-_pwd=`pwd`
-cd ${with_toolsdir}
-with_toolsdir=`pwd`
-cd ${_pwd}
-echo "Overriding toolsdir with" ${with_toolsdir}
-TOOLSBINDIR=${with_toolsdir}
-fi
-
-
-
 
 case ${host_os} in
 aix*)
@@ -6272,7 +6303,7 @@
 
 
 TEMP_LDFLAGS=$LDFLAGS
-LDFLAGS="$TEMP_FLAGS -L$PG_LIBDIR"
+LDFLAGS="$TEMP_LDFLAGS -L$PG_LIBDIR"
 
 echo "$as_me:$LINENO: checking for PQunescapeBytea in -lpq" >&5
 echo $ECHO_N "checking for PQunescapeBytea in -lpq... $ECHO_C" >&6
@@ -6746,9 +6777,19 @@
    { (exit 1); exit 1; }; }
 fi
 
-LDFLAGS="$TEMP_FLAGS -L$PG_PKGLIBDIR"
 echo "$as_me:$LINENO: checking for plpgsql.so" >&5
 echo $ECHO_N "checking for plpgsql.so... $ECHO_C" >&6
+if test -n "${with_pgpkglibdir}"; then
+    echo "$as_me:$LINENO: result: skipped due to override" >&5
+echo "${ECHO_T}skipped due to override" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_PKGLIBDIR_VERIFIED 1
+_ACEOF
+
+else
+    LDFLAGS="$TEMP_LDFLAGS -L$PG_PKGLIBDIR"
+
 if test -s $PG_PKGLIBDIR"/plpgsql.so"; then
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -6784,17 +6825,26 @@
     " >&2;}
    { (exit 1); exit 1; }; }
 fi
+fi
 
 echo "$as_me:$LINENO: checking for postgresql.conf.sample" >&5
 echo $ECHO_N "checking for postgresql.conf.sample... $ECHO_C" >&6
-PGSHARE_POSSIBLE_LOCATIONS="${with_pgsharedir} /usr/local/pgsql/share /usr/local/share/postgresql /usr/share/postgresql /usr/local/share/pgsql /usr/share/pgsql /opt/local/pgsql/share /opt/pgsql/share ${PG_BINDIR}/../share"
+if test -n "$PG_SHAREDIR" ; then
+    echo "$as_me:$LINENO: result: skipped due to override" >&5
+echo "${ECHO_T}skipped due to override" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_SHAREDIR_VERIFIED 1
+_ACEOF
+
+else
+    PGSHARE_POSSIBLE_LOCATIONS="$PG_SHAREDIR /usr/local/pgsql/share /usr/local/share/postgresql /usr/share/postgresql /usr/local/share/pgsql /usr/share/pgsql /opt/local/pgsql/share /opt/pgsql/share ${PG_BINDIR}/../share"
 for i in $PGSHARE_POSSIBLE_LOCATIONS; do
     if test -s "$i/postgresql.conf.sample" ; then
 	PG_SHAREDIR=$i/
 	break;
     fi
 done
-
 if test -n "$PG_SHAREDIR" ; then
     echo "$as_me:$LINENO: result: ${PG_SHAREDIR}postgresql.conf.sample" >&5
 echo "${ECHO_T}${PG_SHAREDIR}postgresql.conf.sample" >&6
@@ -6814,8 +6864,9 @@
 	" >&2;}
    { (exit 1); exit 1; }; }
 fi
+fi
 
-LDFLAGS="$TEMP_FLAGS -L$PG_LIBDIR"
+LDFLAGS="$TEMP_LDFLAGS -L$PG_LIBDIR"
 
 
 case "${host_os}" in
@@ -9401,22 +9452,46 @@
 
 
 
-# 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;
-echo "$as_me:$LINENO: checking if you have requested documentation building" >&5
-echo $ECHO_N "checking if you have requested documentation building... $ECHO_C" >&6
-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
+PGINCLUDEDIR=$PG_INCLUDEDIR
+
+PGINCLUDESERVERDIR=$PG_INCLUDESERVERDIR
+
+PGLIBDIR=$PG_LIBDIR
+
+PGPKGLIBDIR=$PG_PKGLIBDIR
+
+PGSHAREDIR=$PG_SHAREDIR
+
+PGBINDIR=$PG_BINDIR
+
+HAVE_NETSNMP=$HAVE_NETSNMP
+
+NETSNMP_CFLAGS=$NETSNMP_CFLAGS
+
+NETSNMP_AGENTLIBS=$NETSNMP_AGENTLIBS
+
+TOOLSBIN=$TOOLSBIN
+
+DOCDIR=$DOCDIR
+
+
+
+HOST_OS=$host_os
+
+PORTNAME=$template
+
+
+#-- if test ${prefix} = "NONE"; then
+SLONBINDIR="${PG_BINDIR}"
+#-- else
+#--   SLONBINDIR="${prefix}/bin"
+#-- fi
+SLONBINDIR=$SLONBINDIR
+
+
+# ----
+# Documentation checks
+# ----
 
 
 
@@ -9451,44 +9526,15 @@
 
 
 
-PGINCLUDEDIR=$PG_INCLUDEDIR
-
-PGINCLUDESERVERDIR=$PG_INCLUDESERVERDIR
-
-PGLIBDIR=$PG_LIBDIR
-
-PGPKGLIBDIR=$PG_PKGLIBDIR
-
-PGSHAREDIR=$PG_SHAREDIR
-
-PGBINDIR=$PG_BINDIR
-
-HAVE_NETSNMP=$HAVE_NETSNMP
-
-NETSNMP_CFLAGS=$NETSNMP_CFLAGS
-
-NETSNMP_AGENTLIBS=$NETSNMP_AGENTLIBS
-
-TOOLSBIN=$TOOLSBIN
-
-DOCDIR=$DOCDIR
-
 with_docs=$with_docs
 
 
+echo "$as_me:$LINENO: checking if you have requested documentation building" >&5
+echo $ECHO_N "checking if you have requested documentation building... $ECHO_C" >&6
+if test "$with_docs" = "yes"; then
 
-HOST_OS=$host_os
-
-PORTNAME=$template
-
-
-#-- if test ${prefix} = "NONE"; then
-SLONBINDIR="${PG_BINDIR}"
-#-- else
-#--   SLONBINDIR="${prefix}/bin"
-#-- fi
-SLONBINDIR=$SLONBINDIR
-
+	echo "$as_me:$LINENO: result: $with_docs" >&5
+echo "${ECHO_T}$with_docs" >&6
 
 # ----
 # Tools for building docs
@@ -9987,6 +10033,10 @@
 fi
 SGMLSPL=$SGMLSPL
 
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
                     ac_config_files="$ac_config_files Makefile.global GNUmakefile"
 
@@ -10354,7 +10404,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050917, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20051102, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10414,7 +10464,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050917
+postgresql-slony1-engine config.status HEAD_20051102
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10629,7 +10679,7 @@
 s, at LD@,$LD,;t t
 s, at YFLAGS@,$YFLAGS,;t t
 s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050917@,$HEAD_20050917,;t t
+s, at HEAD_20051102@,$HEAD_20051102,;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
@@ -10650,11 +10700,11 @@
 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
 s, at SLONBINDIR@,$SLONBINDIR,;t t
+s, at with_docs@,$with_docs,;t t
 s, at GROFF@,$GROFF,;t t
 s, at PS2PDF@,$PS2PDF,;t t
 s, at DJPEG@,$DJPEG,;t t