Cleanup the way we detect json-c library to use only pkg-config

diff --git a/README.md b/README.md
index 2b36d396714078efc133269f091bd89291e36daf..35454173e2431888f4b38c53aa628968549b7ad4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -200,8 +200,10 @@ To support the HTTP statistics channel, the server must be linked with at
 least one of the following: libxml2
 [http://xmlsoft.org](http://xmlsoft.org) or json-c
 [https://github.com/json-c](https://github.com/json-c).  If these are
-installed at a nonstandard location, specify the prefix using
-`--with-libxml2=/prefix` or `--with-libjson=/prefix`.
+installed at a nonstandard location, then:
+
+* for libxml2, specify the prefix using `--with-libxml2=/prefix`,
+* for json-c, adjust `PKG_CONFIG_PATH`.
 
 To support compression on the HTTP statistics channel, the server must be
 linked against libzlib.  If this is installed in a nonstandard location,

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 8f009a4b81239726682472c76f02db22107c476b..04e0af788c14a8cf4467bedc2a969f1239a8b507 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
-               ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+               ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
@@ -34,8 +34,8 @@ ISCDEPLIBS =  ../../lib/isc/libisc.@A@
 BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
 NSDEPENDLIBS = ../../lib/ns/libns.@A@
 
-LIBS =         ${ISCLIBS} @LIBS@
-NOSYMLIBS =    ${ISCNOSYMLIBS} @LIBS@
+LIBS =         ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
+NOSYMLIBS =    ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 0588f8b7dabec84ba728ac337491e972a4383a99..383f651294bf7f85bcfdc65f60642fcf711225f2 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
-       ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
+       ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =
@@ -41,9 +41,9 @@ BIND9DEPLIBS =        ../../lib/bind9/libbind9.@A@
 RNDCLIBS =     ${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
 RNDCDEPLIBS =  ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
-NOSYMLIBS =    ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
+NOSYMLIBS =    ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 CONFDEPLIBS =  ${DNSDEPLIBS} ${ISCDEPLIBS}
 

diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index ea106f80632457fb0511c3d1496ac4149fce016d..3253b207145d9f31c701cc6e5feb31eec34cfa1f 100644 (file)
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@
+               ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DVERSION=\"${VERSION}\" \
                -DSYSCONFDIR=\"${sysconfdir}\"
@@ -35,8 +35,8 @@ IRSDEPLIBS =  ../../lib/irs/libirs.@A@
 
 DEPLIBS =      ${DNSDEPLIBS} ${IRSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-NOSYMLIBS =    ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
+NOSYMLIBS =    ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 8ea146fa0dbf60f31f865a9ef0f6cf591fe105a7..d80a2b28389bbafcb675d7fdef0e67372881e459 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -19,7 +19,7 @@ READLINE_LIB = @READLINE_LIB@
 
 CINCLUDES =    -I${srcdir}/include ${DNS_INCLUDES} \
                ${BIND9_INCLUDES} ${ISC_INCLUDES} \
-               ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@
+               ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -41,10 +41,10 @@ DEPLIBS =   ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
                ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
 
 LIBS =         ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-               ${ISCLIBS} @LIBIDN2_LIBS@ @LIBS@
+               ${ISCLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@
 
 NOSYMLIBS =    ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-               ${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @LIBS@
+               ${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index dfaad27ff4ca2bfee4e9d7e1b9e6022cae71b901..e67cba9eb2a3a6e4e38b8058d56c72ea3a19cbc4 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -29,9 +29,9 @@ ISCDEPLIBS =  ../../lib/isc/libisc.@A@
 
 DEPLIBS =      ${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
-NOSYMLIBS =    ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
+NOSYMLIBS =    ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 # Alphabetically
 TARGETS =      dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 3b20df73463546448080e319a6ebca1f80180cfe..6cb812ba0dc05d2235dfcd56886206e8e9a9e2cb 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -46,7 +46,7 @@ CINCLUDES =   -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${NS_INCLUDES} ${DNS_INCLUDES} \
                ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
                ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
-               ${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@
+               ${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =      @CONTRIB_DLZ@
 
@@ -73,12 +73,12 @@ DEPLIBS =   ${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
 LIBS =         ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
                ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
                ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
-               @LIBS@
+               @JSON_C_LIBS@ @LIBS@
 
 NOSYMLIBS =    ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
                ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
                ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
-               @LIBS@
+               @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =      unix
 

diff --git a/bin/named/main.c b/bin/named/main.c
index dbe39772db4cdaab59a85b384acf7e5fca7d4bc2..5f8b9658d17997caefd58cef7e148d66b062325f 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -526,10 +526,10 @@ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
        printf("linked to libxml2 version: %s\n",
               xmlParserVersion);
 #endif
-#if defined(HAVE_JSON) && defined(JSON_C_VERSION)
-       printf("compiled with libjson-c version: %s\n",
+#if defined(HAVE_JSON_C)
+       printf("compiled with json-c version: %s\n",
               JSON_C_VERSION);
-       printf("linked to libjson-c version: %s\n",
+       printf("linked to json-c version: %s\n",
               json_c_version());
 #endif
 #if defined(HAVE_ZLIB) && defined(ZLIB_VERSION)
@@ -1092,13 +1092,13 @@ setup(void) {
                      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
                      "linked to libxml2 version: %s", xmlParserVersion);
 #endif
-#if defined(HAVE_JSON) && defined(JSON_C_VERSION)
+#if defined(HAVE_JSON_C)
        isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
                      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
-                     "compiled with libjson-c version: %s", JSON_C_VERSION);
+                     "compiled with json-c version: %s", JSON_C_VERSION);
        isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
                      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
-                     "linked to libjson-c version: %s", json_c_version());
+                     "linked to json-c version: %s", json_c_version());
 #endif
 #if defined(HAVE_ZLIB) && defined(ZLIB_VERSION)
        isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 79930fa5e987f7af5de857cda1dba3e894cfd77d..bd6df21caa7e5326268c8a4362e1988b847b0d21 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -74,7 +74,7 @@ stats_dumparg {
 
 static isc_once_t once = ISC_ONCE_INIT;
 
-#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
+#if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C)
 #define EXTENDED_STATS
 #else
 #undef EXTENDED_STATS
@@ -1070,7 +1070,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
        xmlTextWriterPtr writer;
        int xmlrc;
 #endif
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        json_object *job, *cat, *counter;
 #endif
 
@@ -1086,7 +1086,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
        memset(values, 0, sizeof(values[0]) * ncounters);
        isc_stats_dump(stats, generalstat_dump, &dumparg, options);
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        cat = job = (json_object *) arg;
        if (ncounters > 0 && type == isc_statsformat_json) {
                if (category != NULL) {
@@ -1161,7 +1161,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
 #endif
                        break;
                case isc_statsformat_json:
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
                        counter = json_object_new_int64(value);
                        if (counter == NULL)
                                return (ISC_R_NOMEMORY);
@@ -1190,7 +1190,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) {
        xmlTextWriterPtr writer;
        int xmlrc;
 #endif
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        json_object *zoneobj, *obj;
 #endif
 
@@ -1224,7 +1224,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) {
 #endif
                break;
        case isc_statsformat_json:
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
                zoneobj = (json_object *) dumparg->arg;
                obj = json_object_new_int64(val);
                if (obj == NULL)
@@ -1256,7 +1256,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) {
        xmlTextWriterPtr writer;
        int xmlrc;
 #endif
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        json_object *zoneobj, *obj;
        char buf[1024];
 #endif
@@ -1308,7 +1308,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) {
 #endif
                break;
        case isc_statsformat_json:
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
                zoneobj = (json_object *) dumparg->arg;
                snprintf(buf, sizeof(buf), "%s%s%s",
                         stale ? "#" : "", nxrrset ? "!" : "", typestr);
@@ -1340,7 +1340,7 @@ opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) {
        xmlTextWriterPtr writer;
        int xmlrc;
 #endif
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        json_object *zoneobj, *obj;
 #endif
 
@@ -1366,7 +1366,7 @@ opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) {
 #endif
                break;
        case isc_statsformat_json:
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
                zoneobj = (json_object *) dumparg->arg;
                obj = json_object_new_int64(val);
                if (obj == NULL)
@@ -1397,7 +1397,7 @@ rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) {
        xmlTextWriterPtr writer;
        int xmlrc;
 #endif
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        json_object *zoneobj, *obj;
 #endif
 
@@ -1423,7 +1423,7 @@ rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) {
 #endif
                break;
        case isc_statsformat_json:
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
                zoneobj = (json_object *) dumparg->arg;
                obj = json_object_new_int64(val);
                if (obj == NULL)
@@ -2195,7 +2195,7 @@ render_xml_traffic(const char *url, isc_httpdurl_t *urlinfo,
 
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 /*
  * Which statistics to include when rendering to JSON
  */
@@ -3098,7 +3098,7 @@ render_json_traffic(const char *url, isc_httpdurl_t *urlinfo,
                            freecb, freecb_args));
 }
 
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 static isc_result_t
 render_xsl(const char *url, isc_httpdurl_t *urlinfo,
@@ -3314,7 +3314,7 @@ add_listener(named_server_t *server, named_statschannel_t **listenerp,
        isc_httpdmgr_addurl(listener->httpdmgr, "/xml/v3/traffic",
                            render_xml_traffic, server);
 #endif
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
        isc_httpdmgr_addurl(listener->httpdmgr, "/json",
                            render_json_all, server);
        isc_httpdmgr_addurl(listener->httpdmgr, "/json/v1",
@@ -3449,12 +3449,12 @@ named_statschannels_configure(named_server_t *server, const cfg_obj_t *config,
                              "statistics-channels: XML library missing, "
                              "only JSON stats will be available");
 #endif /* !HAVE_LIBXML2 */
-#ifndef HAVE_JSON
+#ifndef HAVE_JSON_C
                isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
                              NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
                              "statistics-channels: JSON library missing, "
                              "only XML stats will be available");
-#endif /* !HAVE_JSON */
+#endif /* !HAVE_JSON_C */
 #endif /* EXTENDED_STATS */
 
                for (element = cfg_list_first(statschannellist);

diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
index 01c60e790b0f930d5de89b113f103bd369c257ad..5ce33e97f608ccbf3ca19b01939aff1cff364a80 100644 (file)
--- a/bin/named/unix/Makefile.in
+++ b/bin/named/unix/Makefile.in
@@ -15,7 +15,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    -I${srcdir}/include -I${srcdir}/../include \
                ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
-               ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+               ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 1d26ea0d0d6660dd2c0370639a3009bf2a0fd1b9..4c7515a456757f849e688b1eeae8bb03d097b116 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -21,7 +21,7 @@ DST_GSSAPI_INC = @DST_GSSAPI_INC@
 
 CINCLUDES =    ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \
                ${ISCCFG_INCLUDES} ${IRS_INCLUDES} ${DST_GSSAPI_INC} \
-               @OPENSSL_INCLUDES@
+               @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DVERSION=\"${VERSION}\" @USE_GSSAPI@
 CWARNINGS =
@@ -43,10 +43,10 @@ DEPLIBS =   ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
                ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
 
 LIBS =         ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \
-               ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
+               ${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
 NOSYMLIBS =    ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \
-               ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
+               ${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index 2fd986168dbc23a61e7264d2573c3e00ee6f7696..11556dcb028e49d205d1a4c9fcc943173bdef61d 100644 (file)
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -13,7 +13,7 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${ISC_INCLUDES}
+CINCLUDES =    ${ISC_INCLUDES} @JSON_C_CFLAGS@
 
 CDEFINES =
 
@@ -24,7 +24,7 @@ ISCDEPLIBS =  ../../lib/isc/libisc.@A@
 DEPLIBS =      ${ISCDEPLIBS}
 
 # if FORCE_STATIC_PROVIDER: LIBS += ${PROVIDER}
-LIBS =         ${ISCLIBS} @LIBS@
+LIBS =         ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =      benchmarks
 

diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in
index 1497ae7ca11ddafe3a6a052033f490edeaa78495..00ceb4675557bece039db18be60b1a284a9992f4 100644 (file)
--- a/bin/plugins/Makefile.in
+++ b/bin/plugins/Makefile.in
@@ -15,7 +15,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${NS_INCLUDES} ${DNS_INCLUDES} \
-               ${ISCCFG_INCLUDES} ${ISC_INCLUDES}
+               ${ISCCFG_INCLUDES} ${ISC_INCLUDES} @JSON_C_CFLAGS@
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index ef5c65ea50c8a89083a268e32b762bf771c6350d..3e453ea140861595d2af722bb6fb66cfb1bc036f 100644 (file)
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
-       ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
+       ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =
@@ -34,8 +34,8 @@ ISCDEPLIBS =  ../../lib/isc/libisc.@A@
 DNSDEPLIBS =   ../../lib/dns/libdns.@A@
 BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
 
-LIBS =         ${ISCLIBS} @LIBS@
-NOSYMLIBS =    ${ISCNOSYMLIBS} @LIBS@
+LIBS =         ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
+NOSYMLIBS =    ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 RNDCDEPLIBS =  ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
 

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 76f010b450306286860616b7c3f5112931a6f1ef..b35b0ecc170daecf27b19a03d974c59bed30ec77 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -14,7 +14,7 @@ top_srcdir =  @top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-               @OPENSSL_INCLUDES@
+               @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =
@@ -30,7 +30,7 @@ ISCDEPLIBS =  ../../lib/isc/libisc.@A@
 ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
-LIBS =         @LIBS@
+LIBS =         @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =      system @PKCS11_TOOLS@
 TESTDIRS =     system

diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in
index 0aab65749cfbabc7d752b0a189c42f2746d1e433..e5eeaca807a4c49aacb291683f98f15c2faf17d4 100644 (file)
--- a/bin/tests/optional/Makefile.in
+++ b/bin/tests/optional/Makefile.in
@@ -14,7 +14,7 @@ top_srcdir =  @top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-               @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
+               @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
 
 CDEFINES =     @USE_GSSAPI@
 
@@ -32,7 +32,7 @@ ISCDEPLIBS =  ../../../lib/isc/libisc.@A@
 ISCDEPNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
 
-LIBS =         @LIBS@
+LIBS =         @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 8cecc8f9505b69092dd62edd4c3c41488633a4aa..70d5da8660ddeb8d01a9d685c580a1609c30a2b2 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -112,6 +112,7 @@ PYTHON=@PYTHON@
 # Determine if we support various optional features.
 #
 HAVEXMLSTATS=@XMLSTATS@
-HAVEJSONSTATS=@JSONSTATS@
+JSON_C_LIBS="@JSON_C_LIBS@"
+HAVEJSONSTATS=${JSON_C_LIBS:+1}
 ZLIB=@ZLIB@
 NZD=@NZD_TOOLS@

diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in
index 3d09330c0a2c72fc0a8a8f838a24312e2cfc9a3a..7d4922a9fe947b74f1a7a0b6fa3c7b04d8af2ce0 100644 (file)
--- a/bin/tests/system/dyndb/driver/Makefile.in
+++ b/bin/tests/system/dyndb/driver/Makefile.in
@@ -13,7 +13,7 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in
index 66817d5c0aa00dc3fd0ed1312a065e069c84f938..25ac24fbc16d745831de620c1104d76afb8c7d83 100644 (file)
--- a/bin/tests/system/pipelined/Makefile.in
+++ b/bin/tests/system/pipelined/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =
@@ -28,7 +28,7 @@ ISCDEPLIBS =  ../../../../lib/isc/libisc.@A@
 
 DEPLIBS =      ${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
 TARGETS =      pipequeries@EXEEXT@
 

diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in
index a15d26400beb82d132e4eba3bc571a3c15aff065..dd0f71b4c66a39798604280bf0d99e06f41af4c6 100644 (file)
--- a/bin/tests/system/rsabigexponent/Makefile.in
+++ b/bin/tests/system/rsabigexponent/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =
@@ -28,7 +28,7 @@ ISCDEPLIBS =  ../../../../lib/isc/libisc.@A@
 
 DEPLIBS =      ${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
 TARGETS =      bigkey@EXEEXT@
 

diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index be0cf032567cde962cb9875ef002d001fdc807fa..c7e2330e8f01d4f5bd8ec5c16c2d335bd8a94e3b 100644 (file)
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =
@@ -28,7 +28,7 @@ ISCDEPLIBS =  ../../../../lib/isc/libisc.@A@
 
 DEPLIBS =      ${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
 
 TARGETS =      keycreate@EXEEXT@ keydelete@EXEEXT@
 

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 0fd28471d9344ab250dac8a979f55cec24927be6..c2f8c16b67e2f15c469c3c585ebc69425f77ad9f 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-               ${BIND9_INCLUDES} @OPENSSL_INCLUDES@
+               ${BIND9_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -32,8 +32,8 @@ BIND9DEPLIBS =        ../../lib/bind9/libbind9.@A@
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
-LIBS =         ${ISCLIBS} @LIBS@
-NOSYMLIBS =    ${ISCNOSYMLIBS} @LIBS@
+LIBS =         ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
+NOSYMLIBS =    ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/config.h.in b/config.h.in
index 7f6a66c5032472e29554997bf661c35a600e2528..252bb8b553c29b35ac394334448c25a972ad1e31 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -222,10 +222,7 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define if libjson was found */
-#undef HAVE_JSON
-
-/* Define if json-c was found */
+/* Use json-c library */
 #undef HAVE_JSON_C
 
 /* Define to 1 if you have the <kerberosv5/krb5.h> header file. */

diff --git a/configure b/configure
index 884e9edd39ca5aa3079e8c5d927d5ae7ffbd35de..3445c8262c0df5cca4d4c44f11b211d92210d99d 100755 (executable)
--- a/configure
+++ b/configure
@@ -726,7 +726,8 @@ MKDEPPROG
 MKDEPCFLAGS
 MKDEPCC
 ZLIB
-JSONSTATS
+JSON_C_LIBS
+JSON_C_CFLAGS
 XMLSTATS
 NZDTARGETS
 NZDSRCS
@@ -908,6 +909,7 @@ with_gssapi
 with_lmdb
 with_libxml2
 with_libjson
+with_json_c
 with_zlib
 with_purify
 with_gperftools_profiler
@@ -958,6 +960,8 @@ PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 OPENSSL_CFLAGS
 OPENSSL_LIBS
+JSON_C_CFLAGS
+JSON_C_LIBS
 LIBIDN2_CFLAGS
 LIBIDN2_LIBS
 CMOCKA_CFLAGS
@@ -1642,7 +1646,9 @@ Optional Packages:
                           [default=auto]
   --with-lmdb=PATH        build with LMDB library [yes|no|path]
   --with-libxml2=PATH     build with libxml2 library [yes|no|path]
-  --with-libjson=PATH     build with libjson0 library [yes|no|path]
+  --with-libjson          deprecated, use --with-json-c
+  --with-json-c           build with json-c library [yes|no|detect] (default
+                          is detect)
   --with-zlib=PATH        build with zlib for HTTP compression [default=yes]
   --with-purify=PATH      use Rational purify
   --with-gperftools-profiler
@@ -1696,6 +1702,9 @@ Some influential environment variables:
               C compiler flags for OPENSSL, overriding pkg-config
   OPENSSL_LIBS
               linker flags for OPENSSL, overriding pkg-config
+  JSON_C_CFLAGS
+              C compiler flags for JSON_C, overriding pkg-config
+  JSON_C_LIBS linker flags for JSON_C, overriding pkg-config
   LIBIDN2_CFLAGS
               C compiler flags for LIBIDN2, overriding pkg-config
   LIBIDN2_LIBS
@@ -16948,151 +16957,210 @@ fi
 
 
 #
-# was --with-libjson specified?
+# DEPRECATED
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json library" >&5
-$as_echo_n "checking for json library... " >&6; }
 
 # Check whether --with-libjson was given.
 if test "${with_libjson+set}" = set; then :
-  withval=$with_libjson; use_libjson="$withval"
+  withval=$with_libjson; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-libjson is DEPRECATED and will be removed in a future release, use --with-json-c instead" >&5
+$as_echo "$as_me: WARNING: --with-libjson is DEPRECATED and will be removed in a future release, use --with-json-c instead" >&2;}
 else
-  use_libjson="auto"
+  with_libjson="detect"
 fi
 
 
-have_libjson=""
-have_libjson_c=""
-case "$use_libjson" in
-       no)
-               libjson_libs=""
-               ;;
-       auto|yes)
-               for d in /usr /usr/local /opt/local
-               do
-                       if test -f "${d}/include/json/json.h"
-                       then
-                               if test ${d} != /usr
-                               then
-                                       libjson_cflags="-I ${d}/include"
-                                       LIBS="$LIBS -L${d}/lib"
-                               fi
-                               have_libjson="yes"
-                       elif test -f "${d}/include/json-c/json.h"
-                       then
-                               if test ${d} != /usr
-                               then
-                                       libjson_cflags="-I ${d}/include"
-                                       LIBS="$LIBS -L${d}/lib"
-                               fi
-                               have_libjson="yes"
-                               have_libjson_c="yes"
-                       fi
-               done
-               ;;
-       *)
-               if test -f "${use_libjson}/include/json/json.h"
-               then
-                       libjson_cflags="-I${use_libjson}/include"
-                       LIBS="$LIBS -L${use_libjson}/lib"
-                       have_libjson="yes"
-               elif test -f "${use_libjson}/include/json-c/json.h"
-               then
-                       libjson_cflags="-I${use_libjson}/include"
-                       LIBS="$LIBS -L${use_libjson}/lib"
-                       have_libjson="yes"
-                       have_libjson_c="yes"
-               else
-                       as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
-               fi
-               ;;
-esac
+#
+# was --with-json-c specified?
+#
 
-if test "X${have_libjson}" != "X"
-then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_new_int64" >&5
-$as_echo_n "checking for library containing json_object_new_int64... " >&6; }
-if ${ac_cv_search_json_object_new_int64+:} false; then :
-  $as_echo_n "(cached) " >&6
+# Check whether --with-json-c was given.
+if test "${with_json_c+set}" = set; then :
+  withval=$with_json_c;
 else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  with_json_c="$with_libjson"
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char json_object_new_int64 ();
-int
-main ()
-{
-return json_object_new_int64 ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' json json-c; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_json_object_new_int64=$ac_res
+
+case $with_json_c in #(
+  no) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSON_C" >&5
+$as_echo_n "checking for JSON_C... " >&6; }
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;; #(
+  detect) :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json-c >= 0.11" >&5
+$as_echo_n "checking for json-c >= 0.11... " >&6; }
+
+if test -n "$JSON_C_CFLAGS"; then
+    pkg_cv_JSON_C_CFLAGS="$JSON_C_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-c >= 0.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JSON_C_CFLAGS=`$PKG_CONFIG --cflags "json-c >= 0.11" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_json_object_new_int64+:} false; then :
-  break
+ else
+    pkg_failed=untried
 fi
-done
-if ${ac_cv_search_json_object_new_int64+:} false; then :
-
+if test -n "$JSON_C_LIBS"; then
+    pkg_cv_JSON_C_LIBS="$JSON_C_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-c >= 0.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JSON_C_LIBS=`$PKG_CONFIG --libs "json-c >= 0.11" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
 else
-  ac_cv_search_json_object_new_int64=no
+  pkg_failed=yes
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+ else
+    pkg_failed=untried
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_new_int64" >&5
-$as_echo "$ac_cv_search_json_object_new_int64" >&6; }
-ac_res=$ac_cv_search_json_object_new_int64
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+
+
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  as_fn_error $? "found libjson include but not library." "$LINENO" 5
-                       have_libjson=""
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               JSON_C_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c >= 0.11" 2>&1`
+        else
+               JSON_C_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c >= 0.11" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$JSON_C_PKG_ERRORS" >&5
 
-elif test "X$use_libjson" = Xyes
-then
-       as_fn_error $? "include/json{,-c}/json.h not found." "$LINENO" 5
+       :
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       :
 else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+       JSON_C_CFLAGS=$pkg_cv_JSON_C_CFLAGS
+       JSON_C_LIBS=$pkg_cv_JSON_C_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_JSON_C 1" >>confdefs.h
+
+fi ;; #(
+  yes) :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json-c >= 0.11" >&5
+$as_echo_n "checking for json-c >= 0.11... " >&6; }
+
+if test -n "$JSON_C_CFLAGS"; then
+    pkg_cv_JSON_C_CFLAGS="$JSON_C_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-c >= 0.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JSON_C_CFLAGS=`$PKG_CONFIG --cflags "json-c >= 0.11" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$JSON_C_LIBS"; then
+    pkg_cv_JSON_C_LIBS="$JSON_C_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-c >= 0.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JSON_C_LIBS=`$PKG_CONFIG --libs "json-c >= 0.11" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               JSON_C_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c >= 0.11" 2>&1`
+        else
+               JSON_C_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c >= 0.11" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$JSON_C_PKG_ERRORS" >&5
 
-if test "X${have_libjson}" != "X"
-then
-       CFLAGS="$CFLAGS $libjson_cflags"
+       as_fn_error $? "Package requirements (json-c >= 0.11) were not met:
 
-$as_echo "#define HAVE_JSON 1" >>confdefs.h
+$JSON_C_PKG_ERRORS
 
-       if test "X${have_libjson_c}" = Xyes
-       then
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables JSON_C_CFLAGS
+and JSON_C_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables JSON_C_CFLAGS
+and JSON_C_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+       JSON_C_CFLAGS=$pkg_cv_JSON_C_CFLAGS
+       JSON_C_LIBS=$pkg_cv_JSON_C_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_JSON_C 1" >>confdefs.h
 
-       fi
-       JSONSTATS=1
-fi
+fi ;; #(
+  *) :
+    as_fn_error $? "Specifying json-c installation path is not supported, adjust PKG_CONFIG_PATH instead" "$LINENO" 5
+        ;;
+esac
+
+
 
 
 #
@@ -24160,7 +24228,7 @@ report() {
        test "no" = "$found_ipv6" || echo "    IPv6 support (--enable-ipv6)"
        test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
        test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
-       test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
+       test "X$JSON_C_LIBS" = "X" || echo "    JSON statistics (--with-json-c): $JSON_C_CFLAGS $JSON_C_LIBS"
        test "X$ZLIB" = "X" || echo "    HTTP zlib compression (--with-zlib)"
        test "X$NZD_TOOLS" = "X" || echo "    LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
        test "no" = "$with_libidn2" || echo "    IDN support (--with-libidn2)"
@@ -24238,7 +24306,7 @@ report() {
 
     test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
     test "X$XMLSTATS" = "X" && echo "    XML statistics (--with-libxml2)"
-    test "X$JSONSTATS" = "X" && echo "    JSON statistics (--with-libjson)"
+    test "X$JSON_C_LIBS" = "X" && echo "    JSON statistics (--with-json-c)"
     test "X$ZLIB" = "X" && echo "    HTTP zlib compression (--with-zlib)"
     test "X$NZD_TOOLS" = "X" && echo "    LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
     test "no" = "$with_libidn2" && echo "    IDN support (--with-libidn2)"

diff --git a/configure.ac b/configure.ac
index d56f72890bd55c26edcb76f79dd6941b91b626a5..7ec01abfa44f62dcea38eb959eafe32e50995811 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1346,85 +1346,34 @@ fi
 AC_SUBST(XMLSTATS)
 
 #
-# was --with-libjson specified?
+# DEPRECATED
 #
-AC_MSG_CHECKING(for json library)
-AC_ARG_WITH(libjson,
-           AS_HELP_STRING([--with-libjson[=PATH]],
-                          [build with libjson0 library [yes|no|path]]),
-           use_libjson="$withval", use_libjson="auto")
+AC_ARG_WITH([libjson],
+           [AS_HELP_STRING([--with-libjson],
+                           [deprecated, use --with-json-c])],
+           [AC_MSG_WARN([--with-libjson is DEPRECATED and will be removed in a future release, use --with-json-c instead])],
+           [with_libjson="detect"])
 
-have_libjson=""
-have_libjson_c=""
-case "$use_libjson" in
-       no)
-               libjson_libs=""
-               ;;
-       auto|yes)
-               for d in /usr /usr/local /opt/local
-               do
-                       if test -f "${d}/include/json/json.h"
-                       then
-                               if test ${d} != /usr
-                               then
-                                       libjson_cflags="-I ${d}/include"
-                                       LIBS="$LIBS -L${d}/lib"
-                               fi
-                               have_libjson="yes"
-                       elif test -f "${d}/include/json-c/json.h"
-                       then
-                               if test ${d} != /usr
-                               then
-                                       libjson_cflags="-I ${d}/include"
-                                       LIBS="$LIBS -L${d}/lib"
-                               fi
-                               have_libjson="yes"
-                               have_libjson_c="yes"
-                       fi
-               done
-               ;;
-       *)
-               if test -f "${use_libjson}/include/json/json.h"
-               then
-                       libjson_cflags="-I${use_libjson}/include"
-                       LIBS="$LIBS -L${use_libjson}/lib"
-                       have_libjson="yes"
-               elif test -f "${use_libjson}/include/json-c/json.h"
-               then
-                       libjson_cflags="-I${use_libjson}/include"
-                       LIBS="$LIBS -L${use_libjson}/lib"
-                       have_libjson="yes"
-                       have_libjson_c="yes"
-               else
-                       AC_MSG_ERROR([$use_libjson/include/json{,-c}/json.h not found.])
-               fi
-               ;;
-esac
+#
+# was --with-json-c specified?
+#
+AC_ARG_WITH([json-c],
+           [AS_HELP_STRING([--with-json-c],
+                           [build with json-c library [yes|no|detect] (default is detect)])],
+           [], [with_json_c="$with_libjson"])
 
-if test "X${have_libjson}" != "X"
-then
-       AC_MSG_RESULT(yes)
-       AC_SEARCH_LIBS([json_object_new_int64], [json json-c], [],
-                      [AC_MSG_ERROR([found libjson include but not library.])
-                       have_libjson=""])
-elif test "X$use_libjson" = Xyes
-then
-       AC_MSG_ERROR([include/json{,-c}/json.h not found.])
-else
-       AC_MSG_RESULT(no)
-fi
+AS_CASE([$with_json_c],
+       [no],[],
+       [detect],[PKG_CHECK_MODULES([JSON_C], [json-c >= 0.11],
+                                   [AC_DEFINE([HAVE_JSON_C], [1], [Use json-c library])],
+                                   [:])],
+       [yes],[PKG_CHECK_MODULES([JSON_C], [json-c >= 0.11],
+                                [AC_DEFINE([HAVE_JSON_C], [1], [Use json-c library])])],
+       [AC_MSG_ERROR([Specifying json-c installation path is not supported, adjust PKG_CONFIG_PATH instead])]
+       )
 
-if test "X${have_libjson}" != "X"
-then
-       CFLAGS="$CFLAGS $libjson_cflags"
-       AC_DEFINE(HAVE_JSON, 1, [Define if libjson was found])
-       if test "X${have_libjson_c}" = Xyes
-       then
-               AC_DEFINE(HAVE_JSON_C, 1, [Define if json-c was found])
-       fi
-       JSONSTATS=1
-fi
-AC_SUBST(JSONSTATS)
+AC_SUBST([JSON_C_CFLAGS])
+AC_SUBST([JSON_C_LIBS])
 
 #
 # was --with-zlib specified?
@@ -3110,7 +3059,7 @@ report() {
        test "no" = "$found_ipv6" || echo "    IPv6 support (--enable-ipv6)"
        test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
        test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
-       test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
+       test "X$JSON_C_LIBS" = "X" || echo "    JSON statistics (--with-json-c): $JSON_C_CFLAGS $JSON_C_LIBS"
        test "X$ZLIB" = "X" || echo "    HTTP zlib compression (--with-zlib)"
        test "X$NZD_TOOLS" = "X" || echo "    LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
        test "no" = "$with_libidn2" || echo "    IDN support (--with-libidn2)"
@@ -3188,7 +3137,7 @@ report() {
 
     test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
     test "X$XMLSTATS" = "X" && echo "    XML statistics (--with-libxml2)"
-    test "X$JSONSTATS" = "X" && echo "    JSON statistics (--with-libjson)"
+    test "X$JSON_C_LIBS" = "X" && echo "    JSON statistics (--with-json-c)"
     test "X$ZLIB" = "X" && echo "    HTTP zlib compression (--with-zlib)"
     test "X$NZD_TOOLS" = "X" && echo "    LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
     test "no" = "$with_libidn2" && echo "    IDN support (--with-libidn2)"

diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in
index 84ad6c1ebf93936930ff8cb151d7be82551e82ad..6bc7dd7de8cabc051cbabaacda2ab61406b1e5ff 100644 (file)
--- a/fuzz/Makefile.in
+++ b/fuzz/Makefile.in
@@ -6,7 +6,7 @@ abs_srcdir =    @abs_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               @OPENSSL_INCLUDES@
+               @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 CDEFINES =     -DFUZZDIR=\"$(abs_srcdir)\"
 
 ISCLIBS =      ../lib/isc/libisc.@A@ @OPENSSL_LIBS@
@@ -14,7 +14,7 @@ ISCDEPLIBS =  ../lib/isc/libisc.@A@
 DNSLIBS =      ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../lib/dns/libdns.@A@
 
-LIBS =         @LIBS@
+LIBS =         @JSON_C_LIBS@ @LIBS@
 
 OBJS =         main.@O@
 SRCS =         main.c dns_name_fromtext_target.c dns_rdata_fromwire_text.c

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index b2441fb925d39caf50a1e4fc7da10829427a1ebc..ff6069ccde23b6fef14d521fd397a709f96beaf7 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               ${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@
+               ${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 4cc8a472764d4c82c7800364847c33bee6412ff6..55b354bcd8cfd39a247cc8488d19fc9568cb5bff 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -27,7 +27,7 @@ VERSION=@BIND9_VERSION@
 USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
 
 CINCLUDES =    -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
-               ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
+               ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
 
 CDEFINES =     @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 4f1aafec490824f06c056e2ec440e83e8aa4b23d..0602793f9858d9ad540b400a305fcb4fb28699f2 100644 (file)
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1497,7 +1497,7 @@ error:
 }
 #endif
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 #define CHECKMEM(m) do { \
        if (m == NULL) { \
                result = ISC_R_NOMEMORY;\

diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index b6f8b38a60bf0af238e257e83043633b0db184f6..cd1d5189417e895e1d309041f60f90cb0352f979 100644 (file)
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -339,13 +339,13 @@ dns_cache_renderxml(dns_cache_t *cache, xmlTextWriterPtr writer);
  */
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 isc_result_t
 dns_cache_renderjson(dns_cache_t *cache, json_object *cstats);
 /*
  * Render cache statistics and status in JSON
  */
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 ISC_LANG_ENDDECLS
 

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 7b35b935222bc0a9c98c51a3d5a3c7b083e4ac89..ec949e3d211ef002c5345f8d0b4e4526dbf72409 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
+               @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -24,7 +24,7 @@ ISCDEPLIBS =  ../../isc/libisc.@A@
 DNSLIBS =      ../libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../libdns.@A@
 
-LIBS =         @LIBS@ @CMOCKA_LIBS@
+LIBS =         @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
 
 OBJS =         dnstest.@O@
 SRCS =         acl_test.c \

diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index f23a78e1a50f8d25d9128ad2b937f35eabfdd0bc..e19ab69f36d28fee94ac51cbbc15aecfb881fdfa 100644 (file)
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =    -I. -I./include -I${srcdir}/include \
                ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@
+               ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 23fae150856ecb600dfe44c40af42626942fc6bc..bc7df554cc29ea220e369f58649ae4fabb8e5711 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@
+CINCLUDES =    -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/irs/tests/\""
 
 CFGLIBS =      ../../isccfg/libisccfg.@A@
@@ -27,7 +27,7 @@ ISCDEPLIBS =  ../../isc/libisc.@A@
 IRSLIBS =      ../libirs.@A@
 IRSDEPLIBS =   ../libirs.@A@
 
-LIBS =         ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@
+LIBS =         ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
 
 OBJS =
 SRCS =         resconf_test.c

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 971503c448c71a67d6a34dbf1b6fe5b831cb9d39..59ee857e01dd2da05906e85ff00f5578c9c93fb7 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
 CINCLUDES =    -I${srcdir}/unix/include \
                -I${srcdir}/pthreads/include \
                -I./include \
-               -I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@
+               -I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 CDEFINES =
 CWARNINGS =
 
@@ -74,7 +74,7 @@ SRCS =                pk11.c pk11_result.c \
                symtab.c task.c taskpool.c timer.c \
                tm.c version.c
 
-LIBS =         @OPENSSL_LIBS@ @LIBS@
+LIBS =         @OPENSSL_LIBS@ @JSON_C_LIBS@ @LIBS@
 
 # Note: the order of SUBDIRS is important.
 # Attempt to disable parallel processing.

diff --git a/lib/isc/include/isc/json.h b/lib/isc/include/isc/json.h
index 52295e61994712b3e0a81dd9cd70370d07c66562..ee965d172260b4a5a543c203b69f99ba273b6d45 100644 (file)
--- a/lib/isc/include/isc/json.h
+++ b/lib/isc/include/isc/json.h
@@ -12,29 +12,20 @@
 #ifndef ISC_JSON_H
 #define ISC_JSON_H 1
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 /*
- * This file is here mostly to make it easy to add additional libjson header
+ * This file is here mostly to make it easy to add additional json-c header
  * files as needed across all the users of this file.  Rather than place
- * these libjson includes in each file, one include makes it easy to handle
+ * these json-c includes in each file, one include makes it easy to handle
  * the ifdef as well as adding the ability to add additional functions
  * which may be useful.
  */
-#ifdef HAVE_JSON_C
-/*
- * We don't include <json-c/json.h> as the subsequent includes do not
- * prefix the header file names with "json-c/" and using
- * -I <prefix>/include/json-c results in too many filename collisions.
- */
-#include <json-c/linkhash.h>
-#include <json-c/json_util.h>
-#include <json-c/json_object.h>
-#include <json-c/json_tokener.h>
-#include <json-c/json_object_iterator.h>
-#include <json-c/json_c_version.h>
-#else
-#include <json/json.h>
-#endif
+#include <json_c_version.h>
+#include <json_object.h>
+#include <json_object_iterator.h>
+#include <json_tokener.h>
+#include <json_util.h>
+#include <linkhash.h>
 #endif
 
 #define ISC_JSON_RENDERCONFIG          0x00000001 /* render config data */

diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 6f61c17505ee6a606394a7b6ef363e7b905d0b63..ac757729c07cfa2f3307c49fcce29bc0a71b87a7 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -473,13 +473,13 @@ isc_mem_renderxml(xmlTextWriterPtr writer);
  */
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 isc_result_t
 isc_mem_renderjson(json_object *memobj);
 /*%<
  * Render all contexts' statistics and status in JSON.
  */
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 
 /*

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 22cf7bf568173c8a88c5de8013751dca7725106c..db765b9b79a97e245bee91669a180546ae5088e3 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1023,13 +1023,13 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, xmlTextWriterPtr writer);
  */
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 isc_result_t
 isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats);
 /*%<
  * Render internal statistics and other state into JSON format.
  */
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 /*%<
  * See isc_socketmgr_create() above.

diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index f9752f01bbc931a8980227212678685c9a14bf9f..ebb8640507a08570579ca469333e8e1f7a356daf 100644 (file)
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -766,10 +766,10 @@ int
 isc_taskmgr_renderxml(isc_taskmgr_t *mgr, xmlTextWriterPtr writer);
 #endif
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 isc_result_t
 isc_taskmgr_renderjson(isc_taskmgr_t *mgr, json_object *tasksobj);
-#endif
+#endif /* HAVE_JSON_C */
 
 ISC_LANG_ENDDECLS
 

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 923bec045bfa75df074cbd7cb77b87423742fd4b..66be78505781403487db3953bb58343972cecf34 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -2213,7 +2213,7 @@ isc_mem_renderxml(xmlTextWriterPtr writer) {
 
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 #define CHECKMEM(m) RUNTIME_CHECK(m != NULL)
 
 static isc_result_t
@@ -2370,7 +2370,7 @@ isc_mem_renderjson(json_object *memobj) {
                json_object_put(ctxarray);
        return (result);
 }
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 isc_result_t
 isc_mem_create(size_t init_max_size, size_t target_size, isc_mem_t **mctxp) {

diff --git a/lib/isc/task.c b/lib/isc/task.c
index fff7e10b9d83a431af2efe637135a55a308780fa..9af6914af40fc2b07ed029cc512482bf870566a2 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -74,7 +74,7 @@ typedef enum {
        task_state_done
 } task_state_t;
 
-#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
+#if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C)
 static const char *statenames[] = {
        "idle", "ready", "running", "done",
 };
@@ -1763,7 +1763,7 @@ isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, xmlTextWriterPtr writer) {
 }
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 #define CHECKMEM(m) do { \
        if (m == NULL) { \
                result = ISC_R_NOMEMORY;\

diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 7a68a78c5c0dceda8bc4c661db14c733803b38d3..9b8ef1bb3822fcc63b2920222a5875abe05e5ba5 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -15,13 +15,13 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
+CINCLUDES =    -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/isc/tests/\""
 
 ISCLIBS =      ../libisc.@A@ @OPENSSL_LIBS@
 ISCDEPLIBS =   ../libisc.@A@
 
-LIBS =         @LIBS@ @CMOCKA_LIBS@
+LIBS =         @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
 
 OBJS =         isctest.@O@
 

diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index be05fc05bd9095c86150268d766700f918388e44..d892455735fdfa3bb99b88a21776f28c5b35ed17 100644 (file)
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -15,7 +15,7 @@ CINCLUDES =   -I${srcdir}/include \
                -I${srcdir}/../pthreads/include \
                -I../include \
                -I${srcdir}/../include \
-               -I${srcdir}/.. @OPENSSL_INCLUDES@
+               -I${srcdir}/.. @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index fe187028c232d0cf8d6ff9f563fbc9cbb2bcbee0..2c97e6e697d25ac8e89b44db96a114d8ba604d1c 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -5391,7 +5391,7 @@ isc_socket_hasreuseport() {
 }
 
 
-#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
+#if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C)
 static const char *
 _socktype(isc_sockettype_t type)
 {
@@ -5501,7 +5501,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, xmlTextWriterPtr writer) {
 }
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 #define CHECKMEM(m) do { \
        if (m == NULL) { \
                result = ISC_R_NOMEMORY;\
@@ -5616,7 +5616,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) {
 
        return (result);
 }
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 isc_result_t
 isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp)

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index f635223e555a2cb9886d83fd0ee2f233daf59e19..053edba775b21fac557350ea8b6705a2417bde00 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -3732,7 +3732,7 @@ error:
 }
 #endif /* HAVE_LIBXML2 */
 
-#ifdef HAVE_JSON
+#ifdef HAVE_JSON_C
 #define CHECKMEM(m) do { \
        if (m == NULL) { \
                result = ISC_R_NOMEMORY;\
@@ -3869,7 +3869,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats) {
 
        return (result);
 }
-#endif /* HAVE_JSON */
+#endif /* HAVE_JSON_C */
 
 isc_result_t
 isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp)

diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 81b362534dae94ebad33c6d190b3514262098ccd..cad75e2aa020f611218ebd6443ae7b0f2e069704 100644 (file)
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               ${ISCCC_INCLUDES} @OPENSSL_INCLUDES@
+               ${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/isccc/tests/Makefile.in b/lib/isccc/tests/Makefile.in
index 09ea9bf505c11dd0b3f21e0297bda5842845717d..c3029edd1958544a3279e994b84a12823dfe1b16 100644 (file)
--- a/lib/isccc/tests/Makefile.in
+++ b/lib/isccc/tests/Makefile.in
@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@
+CINCLUDES =    -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
 CDEFINES =
 
 ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index fbc237f4754050e081c2d99e2fe2d9961f909923..9d00b1199050b269067e029039c9d352feba946d 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
+CINCLUDES =    -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} @JSON_C_CFLAGS@
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index c5036e293d060143fec446639f5735b065169c95..abadec2a63f31bcad875ee06ba701469913a3dd5 100644 (file)
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =    -I. -Iinclude \
                ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-               @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
+               @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -27,7 +27,7 @@ DNSDEPLIBS =  ../../dns/libdns.@A@
 ISCCFGLIBS =   ../libisccfg.@A@
 ISCCFGDEPLIBS = ../libisccfg.@A@
 
-LIBS =         @LIBS@ @CMOCKA_LIBS@
+LIBS =         @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
 
 OBJS =
 SRCS =         parser_test.c

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index 96228b3500e37b4c5628f7cff936c43469e86e73..9ed155738722d7aff63e0dd0381e0642223ef163 100644 (file)
--- a/lib/ns/Makefile.in
+++ b/lib/ns/Makefile.in
@@ -26,7 +26,7 @@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
 
 CINCLUDES =    -I. -I${top_srcdir}/lib/ns -Iinclude \
                ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
+               @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DNAMED_PLUGINDIR=\"${plugindir}\"
 

diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index e6d3049ede8341cd007f54b0b520cbf6d49f45ec..b12c7cea1ea6b093c09e50a7cf99e445d052ab8b 100644 (file)
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
+               @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\"
 
 ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -26,7 +26,7 @@ DNSDEPLIBS =  ../../dns/libdns.@A@
 NSLIBS =       ../libns.@A@
 NSDEPLIBS =    ../libns.@A@
 
-LIBS =         @LIBS@ @CMOCKA_LIBS@
+LIBS =         @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
 
 
 OBJS =         nstest.@O@

diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index 339e4f7f06d388acf15b6df8da12496d788e29ab..839607665cce1e614b3f3663c6f4fb09d16ec235 100644 (file)
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
 CINCLUDES =    -I${srcdir}/include -I../dns/include \
                ${DNS_INCLUDES} ${ISC_INCLUDES} \
                -I${top_srcdir}/lib/irs/include \
-               -I../../lib/irs/include @OPENSSL_INCLUDES@
+               -I../../lib/irs/include @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
 
 CDEFINES =     -DVERSION=\"${VERSION}\" \
                -DSYSCONFDIR=\"${sysconfdir}\"
@@ -36,7 +36,7 @@ IRSDEPLIBS =  ../irs/libirs.@A@
 
 DEPLIBS =      ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ @JSON_C_LIBS@
 
 SUBDIRS =
 

diff --git a/win32utils/Configure b/win32utils/Configure
index 9731b0c187aac94bb14649f79b1fd4f6b0238c9d..60c5e0e103f9518950168fe22dea5af49dc34fcd 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -2955,7 +2955,7 @@ exit 0;
 #  --with-gssapi supported with MIT (K)erberos (f)or (W)indows
 #  --with-lmdb no supported on WIN32 (port is not reliable)
 #  --with-libxml2 supported
-#  --with-libjson not supported on WIN32 (package not available on WIN32)
+#  --with-json-c not supported on WIN32 (package not available on WIN32)
 #  --with-zlib supported
 #  --with-purify not supported (package available on WIN32 but for free?)
 #  --with-gperftools-profiler not supported (package not available on WIN32)