Commit 0771dd3b authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Make the usage of libxml2 opaque to the caller

The libxml2 have previously leaked into the global namespace leading
to forced -I<include_path> for every compilation unit using isc/xml.h
header.  This MR fixes the usage making the caller object opaque.
parent 11db6399
...@@ -23,8 +23,8 @@ CWARNINGS = ...@@ -23,8 +23,8 @@ CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
NSLIBS = ../../lib/ns/libns.@A@ NSLIBS = ../../lib/ns/libns.@A@
......
...@@ -27,8 +27,8 @@ CWARNINGS = ...@@ -27,8 +27,8 @@ CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
......
...@@ -24,8 +24,8 @@ CWARNINGS = ...@@ -24,8 +24,8 @@ CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
IRSLIBS = ../../lib/irs/libirs.@A@ IRSLIBS = ../../lib/irs/libirs.@A@
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
......
...@@ -27,8 +27,8 @@ CWARNINGS = ...@@ -27,8 +27,8 @@ CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
IRSLIBS = ../../lib/irs/libirs.@A@ IRSLIBS = ../../lib/irs/libirs.@A@
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
......
...@@ -21,8 +21,8 @@ CDEFINES = -DVERSION=\"${VERSION}\" ...@@ -21,8 +21,8 @@ CDEFINES = -DVERSION=\"${VERSION}\"
CWARNINGS = CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = ../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
......
...@@ -46,7 +46,8 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ ...@@ -46,7 +46,8 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${NS_INCLUDES} ${DNS_INCLUDES} \ ${NS_INCLUDES} ${DNS_INCLUDES} \
${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \ ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ ${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ \
${LIBXML2_CFLAGS}
CDEFINES = @CONTRIB_DLZ@ CDEFINES = @CONTRIB_DLZ@
...@@ -55,8 +56,8 @@ CWARNINGS = ...@@ -55,8 +56,8 @@ CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
NSLIBS = ../../lib/ns/libns.@A@ NSLIBS = ../../lib/ns/libns.@A@
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <isc/quota.h> #include <isc/quota.h>
#include <isc/sockaddr.h> #include <isc/sockaddr.h>
#include <isc/types.h> #include <isc/types.h>
#include <isc/xml.h>
#include <dns/acl.h> #include <dns/acl.h>
#include <dns/dnstap.h> #include <dns/dnstap.h>
......
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
#include <openssl/crypto.h> #include <openssl/crypto.h>
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#include <libxml/parser.h>
#endif #endif
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#include <zlib.h> #include <zlib.h>
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <isc/task.h> #include <isc/task.h>
#include <isc/timer.h> #include <isc/timer.h>
#include <isc/util.h> #include <isc/util.h>
#include <isc/xml.h>
#include <isccfg/grammar.h> #include <isccfg/grammar.h>
#include <isccfg/namedconf.h> #include <isccfg/namedconf.h>
......
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
#include <named/server.h> #include <named/server.h>
#include <named/statschannel.h> #include <named/statschannel.h>
#if HAVE_LIBXML2
#include <libxml/xmlwriter.h>
#define ISC_XMLCHAR (const xmlChar *)
#endif /* HAVE_LIBXML2 */
#include "bind9.xsl.h" #include "bind9.xsl.h"
struct named_statschannel { struct named_statschannel {
...@@ -1067,7 +1072,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg, ...@@ -1067,7 +1072,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
stats_dumparg_t dumparg; stats_dumparg_t dumparg;
FILE *fp; FILE *fp;
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
xmlTextWriterPtr writer; void *writer;
int xmlrc; int xmlrc;
#endif #endif
#ifdef HAVE_JSON_C #ifdef HAVE_JSON_C
...@@ -1113,7 +1118,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg, ...@@ -1113,7 +1118,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
break; break;
case isc_statsformat_xml: case isc_statsformat_xml:
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
writer = (xmlTextWriterPtr) arg; writer = arg;
if (category != NULL) { if (category != NULL) {
/* <NameOfCategory> */ /* <NameOfCategory> */
...@@ -1187,7 +1192,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { ...@@ -1187,7 +1192,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) {
stats_dumparg_t *dumparg = arg; stats_dumparg_t *dumparg = arg;
FILE *fp; FILE *fp;
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
xmlTextWriterPtr writer; void *writer;
int xmlrc; int xmlrc;
#endif #endif
#ifdef HAVE_JSON_C #ifdef HAVE_JSON_C
...@@ -1253,7 +1258,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { ...@@ -1253,7 +1258,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) {
bool nxrrset = false; bool nxrrset = false;
bool stale = false; bool stale = false;
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
xmlTextWriterPtr writer; void *writer;
int xmlrc; int xmlrc;
#endif #endif
#ifdef HAVE_JSON_C #ifdef HAVE_JSON_C
...@@ -1337,7 +1342,7 @@ opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) { ...@@ -1337,7 +1342,7 @@ opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) {
char codebuf[64]; char codebuf[64];
stats_dumparg_t *dumparg = arg; stats_dumparg_t *dumparg = arg;
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
xmlTextWriterPtr writer; void *writer;
int xmlrc; int xmlrc;
#endif #endif
#ifdef HAVE_JSON_C #ifdef HAVE_JSON_C
...@@ -1394,7 +1399,7 @@ rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) { ...@@ -1394,7 +1399,7 @@ rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) {
char codebuf[64]; char codebuf[64];
stats_dumparg_t *dumparg = arg; stats_dumparg_t *dumparg = arg;
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
xmlTextWriterPtr writer; void *writer;
int xmlrc; int xmlrc;
#endif #endif
#ifdef HAVE_JSON_C #ifdef HAVE_JSON_C
......
...@@ -28,8 +28,8 @@ CWARNINGS = ...@@ -28,8 +28,8 @@ CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
IRSLIBS = ../../lib/irs/libirs.@A@ IRSLIBS = ../../lib/irs/libirs.@A@
......
...@@ -17,7 +17,7 @@ CINCLUDES = ${ISC_INCLUDES} @JSON_C_CFLAGS@ ...@@ -17,7 +17,7 @@ CINCLUDES = ${ISC_INCLUDES} @JSON_C_CFLAGS@
CDEFINES = CDEFINES =
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
......
...@@ -19,7 +19,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ ...@@ -19,7 +19,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
NSLIBS = ../../lib/ns/libns.@A@ NSLIBS = ../../lib/ns/libns.@A@
LIBS = LIBS =
......
...@@ -23,8 +23,8 @@ CWARNINGS = ...@@ -23,8 +23,8 @@ CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
......
...@@ -21,8 +21,8 @@ CWARNINGS = ...@@ -21,8 +21,8 @@ CWARNINGS =
BACKTRACECFLAGS = @BACKTRACECFLAGS@ BACKTRACECFLAGS = @BACKTRACECFLAGS@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@
......
...@@ -23,8 +23,8 @@ BACKTRACECFLAGS = @BACKTRACECFLAGS@ ...@@ -23,8 +23,8 @@ BACKTRACECFLAGS = @BACKTRACECFLAGS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCCFGLIBS = ../../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../../lib/isccfg/libisccfg.@A@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../../lib/dns/libdns.@A@
......
...@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ ...@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${ISC_INCLUDES} CINCLUDES = ${ISC_INCLUDES}
CDEFINES = CDEFINES =
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
LIBS = ${ISCLIBS} @LIBS@ LIBS = ${ISCLIBS} @LIBS@
......
...@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ ...@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${ISC_INCLUDES} CINCLUDES = ${ISC_INCLUDES}
CDEFINES = CDEFINES =
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
LIBS = ${ISCLIBS} @LIBS@ LIBS = ${ISCLIBS} @LIBS@
......
...@@ -23,7 +23,7 @@ CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@ ...@@ -23,7 +23,7 @@ CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@
CWARNINGS = CWARNINGS =
DNSLIBS = DNSLIBS =
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = DNSDEPLIBS =
ISCDEPLIBS = ISCDEPLIBS =
......
...@@ -111,7 +111,8 @@ PYTHON=@PYTHON@ ...@@ -111,7 +111,8 @@ PYTHON=@PYTHON@
# #
# Determine if we support various optional features. # Determine if we support various optional features.
# #
HAVEXMLSTATS=@XMLSTATS@ LIBXML2_LIBS="@LIBXML2_LIBS@"
HAVEXMLSTATS=${LIBXML2_LIBS:+1}
JSON_C_LIBS="@JSON_C_LIBS@" JSON_C_LIBS="@JSON_C_LIBS@"
HAVEJSONSTATS=${JSON_C_LIBS:+1} HAVEJSONSTATS=${JSON_C_LIBS:+1}
ZLIB=@ZLIB@ ZLIB=@ZLIB@
......
...@@ -19,7 +19,7 @@ CDEFINES = ...@@ -19,7 +19,7 @@ CDEFINES =
CWARNINGS = CWARNINGS =
DNSLIBS = ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = ../../../../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../../../../lib/isc/libisc.@A@
......
...@@ -21,7 +21,7 @@ CDEFINES = ...@@ -21,7 +21,7 @@ CDEFINES =
CWARNINGS = CWARNINGS =
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
......
...@@ -20,7 +20,7 @@ CINCLUDES = ${ISC_INCLUDES} ...@@ -20,7 +20,7 @@ CINCLUDES = ${ISC_INCLUDES}
CDEFINES = CDEFINES =
CWARNINGS = CWARNINGS =
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = DNSDEPLIBS =
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
......
...@@ -21,7 +21,7 @@ CDEFINES = ...@@ -21,7 +21,7 @@ CDEFINES =
CWARNINGS = CWARNINGS =
DNSLIBS = DNSLIBS =
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = DNSDEPLIBS =
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
......
...@@ -21,7 +21,7 @@ CDEFINES = ...@@ -21,7 +21,7 @@ CDEFINES =
CWARNINGS = CWARNINGS =
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
......
...@@ -21,7 +21,7 @@ CDEFINES = ...@@ -21,7 +21,7 @@ CDEFINES =
CWARNINGS = CWARNINGS =
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
......
...@@ -23,8 +23,8 @@ CWARNINGS = ...@@ -23,8 +23,8 @@ CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
BIND9LIBS = ../../lib/bind9/libbind9.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS}
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@
......
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
/* Define to 1 if you have the `socket' library (-lsocket). */ /* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET #undef HAVE_LIBSOCKET
/* Define if libxml2 was found */ /* Use libxml2 library */
#undef HAVE_LIBXML2 #undef HAVE_LIBXML2
/* Define to 1 if you have the <linux/netlink.h> header file. */ /* Define to 1 if you have the <linux/netlink.h> header file. */
......
...@@ -728,7 +728,8 @@ MKDEPCC ...@@ -728,7 +728,8 @@ MKDEPCC
ZLIB ZLIB
JSON_C_LIBS JSON_C_LIBS
JSON_C_CFLAGS JSON_C_CFLAGS
XMLSTATS LIBXML2_LIBS
LIBXML2_CFLAGS
NZDTARGETS NZDTARGETS
NZDSRCS NZDSRCS
NZD_TOOLS NZD_TOOLS
...@@ -964,6 +965,8 @@ PKG_CONFIG_PATH ...@@ -964,6 +965,8 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR
OPENSSL_CFLAGS OPENSSL_CFLAGS
OPENSSL_LIBS OPENSSL_LIBS
LIBXML2_CFLAGS
LIBXML2_LIBS
JSON_C_CFLAGS JSON_C_CFLAGS
JSON_C_LIBS JSON_C_LIBS
LIBIDN2_CFLAGS LIBIDN2_CFLAGS
...@@ -1653,7 +1656,8 @@ Optional Packages: ...@@ -1653,7 +1656,8 @@ Optional Packages:
Specify path for system-supplied GSSAPI Specify path for system-supplied GSSAPI
[default=auto] [default=auto]
--with-lmdb=PATH build with LMDB library [yes|no|path] --with-lmdb=PATH build with LMDB library [yes|no|path]
--with-libxml2=PATH build with libxml2 library [yes|no|path] --with-libxml2 build with libxml2 library [yes|no|auto] (default is
auto)
--with-libjson deprecated, use --with-json-c --with-libjson deprecated, use --with-json-c
--with-json-c build with json-c library [yes|no|detect] (default --with-json-c build with json-c library [yes|no|detect] (default
is detect) is detect)
...@@ -1710,6 +1714,10 @@ Some influential environment variables: ...@@ -1710,6 +1714,10 @@ Some influential environment variables:
C compiler flags for OPENSSL, overriding pkg-config C compiler flags for OPENSSL, overriding pkg-config
OPENSSL_LIBS OPENSSL_LIBS
linker flags for OPENSSL, overriding pkg-config linker flags for OPENSSL, overriding pkg-config
LIBXML2_CFLAGS
C compiler flags for LIBXML2, overriding pkg-config
LIBXML2_LIBS
linker flags for LIBXML2, overriding pkg-config
JSON_C_CFLAGS JSON_C_CFLAGS
C compiler flags for JSON_C, overriding pkg-config C compiler flags for JSON_C, overriding pkg-config
JSON_C_LIBS linker flags for JSON_C, overriding pkg-config JSON_C_LIBS linker flags for JSON_C, overriding pkg-config
...@@ -12653,8 +12661,6 @@ fi ...@@ -12653,8 +12661,6 @@ fi
# #
# expanded_sysconfdir is needed for replacement in the python utilities # expanded_sysconfdir is needed for replacement in the python utilities
# #
# TODO: use sed in the Makefile instead of autoconf to do the replacement
#
expanded_sysconfdir=`eval echo $sysconfdir` expanded_sysconfdir=`eval echo $sysconfdir`
...@@ -17029,82 +17035,189 @@ fi ...@@ -17029,82 +17035,189 @@ fi
# #
# was --with-libxml2 specified? # was --with-libxml2 specified?
# #
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 library" >&5
$as_echo_n "checking for libxml2 library... " >&6; }
# Check whether --with-libxml2 was given. # Check whether --with-libxml2 was given.
if test "${with_libxml2+set}" = set; then : if test "${with_libxml2+set}" = set; then :
withval=$with_libxml2; use_libxml2="$withval" withval=$with_libxml2;
else else
use_libxml2="auto" with_libxml2="auto"
fi