3847. [bug] 'configure --with-dlz-postgres' failed to fail when

                        there is not support available.

(cherry picked from commit 61fbd791fbd817301dcac27c05e1e742c37b10ab)

diff --git a/CHANGES b/CHANGES
index 19868dad540af4958cdce8f53a9954e81c9b3b53..babf25a0dac63b2c6d9b06a04b73dc80283b3f79 100644 (file)
--- 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=<serial>" should result in a UDP
                        ixfr query. [RT #35980]
 

diff --git a/configure b/configure
index 21a014c2b3a7c02f2d12011711c4ca2961226fc1..93099a7f45fd62c01be1531173b46616dcefff1b 100755 (executable)
--- a/configure
+++ b/configure
@@ -20575,7 +20575,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"
@@ -20590,7 +20590,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 006c4d3390292a538e856422c8ddc21aac427bd1..31969245ece48b665a9fa449f6805b57d52d5fbe 100644 (file)
--- 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