upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 12:20:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

4247. [port] Require both HAVE_JSON and JSON_C_VERSION to be

Browse source 
defined to report json library version. [RT #41045]

(cherry picked from commit f06b6a9b14)
This commit is contained in:
Mark Andrews 2015-10-29 15:22:41 +11:00
parent ed3f67b837
commit b105ce7a8b
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -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]

2
bin/named/main.c
View file

@ -662,7 +662,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",