From owner-svn-src-head@FreeBSD.ORG  Sun Jul 17 12:07:22 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9FEFC106566C;
	Sun, 17 Jul 2011 12:07:22 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 902468FC13;
	Sun, 17 Jul 2011 12:07:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6HC7MjY072889;
	Sun, 17 Jul 2011 12:07:22 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6HC7M3F072887;
	Sun, 17 Jul 2011 12:07:22 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107171207.p6HC7M3F072887@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 17 Jul 2011 12:07:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224129 - head/lib/bind
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jul 2011 12:07:22 -0000

Author: dougb
Date: Sun Jul 17 12:07:22 2011
New Revision: 224129
URL: http://svn.freebsd.org/changeset/base/224129

Log:
  Fixes to make the WITH_BIND_LIBS option functional with BIND 9.8.x

Modified:
  head/lib/bind/config.mk

Modified: head/lib/bind/config.mk
==============================================================================
--- head/lib/bind/config.mk	Sun Jul 17 11:24:34 2011	(r224128)
+++ head/lib/bind/config.mk	Sun Jul 17 12:07:22 2011	(r224129)
@@ -107,6 +107,13 @@ BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBI
 		${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}