From: Mark Andrews <marka@isc.org>
Date: Wed, 14 May 2014 07:20:14 +0000 (+1000)
Subject: 3847.   [bug]           'configure --with-dlz-postgres' failed to fail when
X-Git-Tag: v9.11.0a1~1642
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5a8edcafd13fc63a066e8e42e0f95cdbf9606414;p=thirdparty%2Fbind9.git

3847.   [bug]           'configure --with-dlz-postgres' failed to fail when
                        there is not support available.
---

diff --git a/CHANGES b/CHANGES
index ed870458757..284f9d9a97e 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=<serial>" should result in a UDP
 			ixfr query. [RT #35980]
 
diff --git a/configure b/configure
index a38abb9fc08..bb129afa9d1 100755
--- 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 006c4d33902..31969245ece 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