Merge branch 'feature/master/maxminddb-version-v9_11' into 'v9_11'

Feature/master/maxminddb version v9 11

See merge request isc-projects/bind9!2781
This commit is contained in:
Mark Andrews
2019-12-18 00:58:02 +00:00
2 changed files with 17 additions and 0 deletions
+3
View File
@@ -1,3 +1,6 @@
5337. [func] 'named -V' now reports maxminddb and protobuf-c
versions. [GL !2686]
--- 9.11.14 released ---
5330. [bug] 'configure --without-python' was ineffective if
+14
View File
@@ -57,6 +57,9 @@
#include <gperftools/profiler.h>
#endif
#ifdef HAVE_GEOIP2
#include <maxminddb.h>
#endif
/*
* Defining NS_MAIN provides storage declarations (rather than extern)
@@ -493,6 +496,17 @@ printversion(bool verbose) {
printf("compiled with zlib version: %s\n", ZLIB_VERSION);
printf("linked to zlib version: %s\n", zlibVersion());
#endif
#if defined(HAVE_GEOIP2)
/* Unfortunately, no version define on link time */
printf("linked to maxminddb version: %s\n",
MMDB_lib_version());
#endif
#if defined(HAVE_DNSTAP)
printf("compiled with protobuf-c version: %s\n",
PROTOBUF_C_VERSION);
printf("linked to protobuf-c version: %s\n",
protobuf_c_version());
#endif
#ifdef ISC_PLATFORM_USETHREADS
printf("threads support is enabled\n");
#else