From 81b958bf5bb83dfcbbe4fd492aae76281cdcedc3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 14 May 2014 17:17:09 +1000 Subject: [PATCH] 3847. [bug] 'configure --with-dlz-postgres' failed to fail when there is not support available. (cherry picked from commit 61fbd791fbd817301dcac27c05e1e742c37b10ab) --- CHANGES | 3 +++ configure | 4 ++-- contrib/dlz/config.dlz.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index a56d7f6d9f..3c2cd576c3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +3847. [bug] 'configure --with-dlz-postgres' failed to fail when + there is not support available. + 3846. [bug] "dig +notcp ixfr=" should result in a UDP ixfr query. [RT #35980] diff --git a/configure b/configure index ef80200189..c1341917e7 100755 --- a/configure +++ b/configure @@ -19246,7 +19246,7 @@ test -n "$PG_CONFIG" || PG_CONFIG="not found" fi fi -if test "$use_dlz_postgres" = "yes" +if test "$use_dlz_postgres" = "yes/include" then # User did not specify path and Postgres didn't say - guess it pgdirs="/usr /usr/local /usr/local/pgsql /usr/pkg" @@ -19261,7 +19261,7 @@ then done fi -if test "$use_dlz_postgres" = "yes" +if test "$use_dlz_postgres" = "yes/include" then # Still no joy, give up diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in index 006c4d3390..31969245ec 100644 --- a/contrib/dlz/config.dlz.in +++ b/contrib/dlz/config.dlz.in @@ -79,7 +79,7 @@ then fi fi -if test "$use_dlz_postgres" = "yes" +if test "$use_dlz_postgres" = "yes/include" then # User did not specify path and Postgres didn't say - guess it pgdirs="/usr /usr/local /usr/local/pgsql /usr/pkg" @@ -94,7 +94,7 @@ then done fi -if test "$use_dlz_postgres" = "yes" +if test "$use_dlz_postgres" = "yes/include" then # Still no joy, give up