From cf88cc1ef4c9251bf55fd0939ade0bc926cdf28a Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Sat, 12 Mar 2016 18:38:57 -0800
Subject: [PATCH] Enable 9.6 support

---
 configure                            | 2 +-
 configure.in                         | 2 +-
 src/test/regress/pg_regress_multi.pl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index bd575056c..e122b8702 100755
--- a/configure
+++ b/configure
@@ -1915,7 +1915,7 @@ if test -z "$version_num"; then
   as_fn_error $? "Could not detect PostgreSQL version from pg_config." "$LINENO" 5
 fi
 
-if test "$version_num" != '9.5'; then
+if test "$version_num" != '9.5' -a "$version_num" != '9.6'; then
    as_fn_error $? "Citus is not compatible with the detected PostgreSQL version ${version_num}." "$LINENO" 5
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: building against PostgreSQL $version_num" >&5
diff --git a/configure.in b/configure.in
index 54582744c..e0903260d 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ if test -z "$version_num"; then
   AC_MSG_ERROR([Could not detect PostgreSQL version from pg_config.])
 fi
 
-if test "$version_num" != '9.5'; then
+if test "$version_num" != '9.5' -a "$version_num" != '9.6'; then
    AC_MSG_ERROR([Citus is not compatible with the detected PostgreSQL version ${version_num}.])
 else
    AC_MSG_NOTICE([building against PostgreSQL $version_num])
diff --git a/src/test/regress/pg_regress_multi.pl b/src/test/regress/pg_regress_multi.pl
index bf3764a8a..a5de5ed84 100755
--- a/src/test/regress/pg_regress_multi.pl
+++ b/src/test/regress/pg_regress_multi.pl
@@ -287,7 +287,7 @@ my @arguments = (
     '--user', $user
 );
 
-if ($majorversion eq '9.5')
+if ($majorversion eq '9.5' || $majorversion eq '9.6')
 {
     push(@arguments, '--bindir', "tmp_check/tmp-bin");
 }