Bundle v8.4.0

4 files changed, 15 insertions, 15 deletions

diff --git a/configure b/configure
index b5e84d3131..a448d07d73 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for PostgreSQL 8.4rc2.
+# Generated by GNU Autoconf 2.61 for PostgreSQL 8.4.0.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -576,8 +576,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='8.4rc2'
-PACKAGE_STRING='PostgreSQL 8.4rc2'
+PACKAGE_VERSION='8.4.0'
+PACKAGE_STRING='PostgreSQL 8.4.0'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1289,7 +1289,7 @@ if test "$ac_init_help" = "long"; then
   # 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 8.4rc2 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 8.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1354,7 +1354,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 8.4rc2:";;
+     short | recursive ) echo "Configuration of PostgreSQL 8.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1499,7 +1499,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 8.4rc2
+PostgreSQL configure 8.4.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1515,7 +1515,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 8.4rc2, which was
+It was created by PostgreSQL $as_me 8.4.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -27806,7 +27806,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 8.4rc2, which was
+This file was extended by PostgreSQL $as_me 8.4.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27863,7 +27863,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-PostgreSQL config.status 8.4rc2
+PostgreSQL config.status 8.4.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index b0f52b3c0b..259181eb11 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.601 2009/06/22 23:15:02 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.602 2009/06/27 00:14:47 scrappy Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [8.4rc2], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@postgresql.org])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/doc/bug.template b/doc/bug.template
index 9c902a93d7..ebca416801 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration:
 
   Operating System (example: Linux 2.4.18)	:
 
-  PostgreSQL version (example: PostgreSQL 8.4rc2):  PostgreSQL 8.4rc2
+  PostgreSQL version (example: PostgreSQL 8.4.0):  PostgreSQL 8.4.0
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 4b109203bb..5f05f867a4 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -563,13 +563,13 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 8.4rc2"
+#define PACKAGE_STRING "PostgreSQL 8.4.0"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.4rc2"
+#define PACKAGE_VERSION "8.4.0"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "8.4rc2"
+#define PG_VERSION "8.4.0"
 
 /* PostgreSQL version as a number */
 #define PG_VERSION_NUM 80400