From: Mark Andrews <marka@isc.org>
Date: Fri, 1 Mar 2013 10:33:49 +0000 (+1100)
Subject: #ifdef HAVE_GEOIP
X-Git-Tag: v9.10.0a1~448^2~123
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f9de007a57814af0adc8c3a1c7debb2d94bf1d98;p=thirdparty%2Fbind9.git

#ifdef HAVE_GEOIP
---

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 1626d55f2f8..bcd50e01732 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -58,7 +58,9 @@ cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) {
 	isc_mem_attach(mctx, &actx->mctx);
 	ISC_LIST_INIT(actx->named_acl_cache);
 
+#ifdef HAVE_GEOIP
 	actx->geoip = NULL;
+#endif
 
 	*ret = actx;
 	return (ISC_R_SUCCESS);
diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index 5ff753dd9e6..ba4e828fd11 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -24,13 +24,17 @@
 
 #include <isccfg/cfg.h>
 
+#ifdef HAVE_GEOIP
 #include <dns/geoip.h>
+#endif
 #include <dns/types.h>
 
 typedef struct cfg_aclconfctx {
 	ISC_LIST(dns_acl_t) named_acl_cache;
 	isc_mem_t *mctx;
+#ifdef HAVE_GEOIP
 	dns_geoip_databases_t *geoip;
+#endif
 	isc_refcount_t references;
 } cfg_aclconfctx_t;