From 023343ae9a02972dceb83872a97bb8b8b1c29f1e Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 17 Jul 2011 12:07:22 +0000
Subject: [PATCH] Fixes to make the WITH_BIND_LIBS option functional with BIND
 9.8.x

---
 lib/bind/config.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 3064cbe64163..ebac59aced90 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -107,6 +107,13 @@ BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
 		${LIBISC} ${LIBLWRES}
 .if ${MK_BIND_LIBS} != "no"
 BIND_LDADD=	-lbind9 -ldns -lisccc -lisccfg -lisc -llwres
+CFLAGS+=	-I${BIND_DIR}/lib/isc/include
+CFLAGS+=	-I${BIND_DIR}/lib/isc/unix/include
+CFLAGS+=	-I${BIND_DIR}/lib/isc/pthreads/include
+CFLAGS+=	-I${.CURDIR}/../dns
+CFLAGS+=	-I${BIND_DIR}/lib/dns/include
+CFLAGS+=	-I${BIND_DIR}/lib/isccfg/include
+CFLAGS+=	-I${.CURDIR}/../isc
 .else
 BIND_LDADD=	${BIND_DPADD}
 .endif
@@ -121,8 +128,7 @@ CRYPTO_LDADD=	-lcrypto
 CFLAGS+=	-DHAVE_LIBXML2
 CFLAGS+=	-I/usr/local/include -I/usr/local/include/libxml2
 .if ${MK_BIND_LIBS} != "no"
-CFLAGS+=	-L/usr/local/lib
-BIND_LDADD+=	-lxml2 -lz -liconv -lm
+BIND_LDADD+=	-L/usr/local/lib -lxml2 -lz -liconv -lm
 .else
 BIND_DPADD+=	/usr/local/lib/libxml2.a ${LIBZ} 
 BIND_DPADD+=	/usr/local/lib/libiconv.a ${LIBM}