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 413a9e7f01cd3128835d47bac3461699c3708e8a..6fb6191cbfa15d589b3cf69a96006943cb159094 100644 (file)
--- 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 ccfc7a3adfce82f4302210c31d25fd75cf974e3c..8b852584dfec7d07a530bb424b76d22823882896 100644 (file)
--- 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",