From: Mark Andrews <marka@isc.org>
Date: Thu, 29 Oct 2015 04:22:41 +0000 (+1100)
Subject: 4247.   [port]          Require both HAVE_JSON and JSON_C_VERSION to be
X-Git-Tag: v9.11.0a1~327^2~30
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f06b6a9b14509a3b473f52dd797bc490f6f6511d;p=thirdparty%2Fbind9.git

4247.   [port]          Require both HAVE_JSON and JSON_C_VERSION to be
                        defined to report json library version. [RT #41045]
---

diff --git a/CHANGES b/CHANGES
index 413a9e7f01c..6fb6191cbfa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4247.	[port]		Require both HAVE_JSON and JSON_C_VERSION to be
+			defined to report json library version. [RT #41045]
+
 4246.	[test]		Ensure the statschannel system test runs when BIND
 			is not built with libjson. [RT #40944]
 
diff --git a/bin/named/main.c b/bin/named/main.c
index ccfc7a3adfc..8b852584dfe 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -666,7 +666,7 @@ parse_command_line(int argc, char *argv[]) {
 			printf("linked to libxml2 version: %s\n",
 			       xmlParserVersion);
 #endif
-#ifdef HAVE_JSON
+#if defined(HAVE_JSON) && defined(JSON_C_VERSION)
 			printf("compiled with libjson-c version: %s\n",
 			       JSON_C_VERSION);
 			printf("linked to libjson-c version: %s\n",