From owner-svn-src-all@FreeBSD.ORG  Sun Jul 31 23:09:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 156C8106564A;
	Sun, 31 Jul 2011 23:09:12 +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 04B7D8FC12;
	Sun, 31 Jul 2011 23:09:12 +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 p6VN9BWo067064;
	Sun, 31 Jul 2011 23:09:11 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6VN9Bc9067062;
	Sun, 31 Jul 2011 23:09:11 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107312309.p6VN9Bc9067062@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 31 Jul 2011 23:09:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224556 - stable/8/lib/bind
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Jul 2011 23:09:12 -0000

Author: dougb
Date: Sun Jul 31 23:09:11 2011
New Revision: 224556
URL: http://svn.freebsd.org/changeset/base/224556

Log:
  MFC r224076:
  
  Handle the MK_BIND_XML option more intelligently
  
  MFC r224129:
  
  Fixes for WITH_BIND_LIBS

Modified:
  stable/8/lib/bind/config.mk
Directory Properties:
  stable/8/lib/bind/   (props changed)

Modified: stable/8/lib/bind/config.mk
==============================================================================
--- stable/8/lib/bind/config.mk	Sun Jul 31 21:04:47 2011	(r224555)
+++ stable/8/lib/bind/config.mk	Sun Jul 31 23:09:11 2011	(r224556)
@@ -77,11 +77,6 @@ CFLAGS+=	-D_LARGEFILE_SOURCE -D_FILE_OFF
 .if ${MK_BIND_SIGCHASE} == "yes"
 CFLAGS+=	-DDIG_SIGCHASE
 .endif
-.if ${MK_BIND_XML} == "yes"
-CFLAGS+=	-DHAVE_LIBXML2
-CFLAGS+=	-I/usr/local/include -I/usr/local/include/libxml2
-CFLAGS+=	-L/usr/local/lib -lxml2 -lz -liconv -lm
-.endif
 
 # Link against BIND libraries
 .if ${MK_BIND_LIBS} == "no"
@@ -109,6 +104,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
@@ -119,6 +121,16 @@ CRYPTO_DPADD=	${LIBCRYPTO}
 CRYPTO_LDADD=	-lcrypto
 .endif
 
+.if ${MK_BIND_XML} == "yes"
+CFLAGS+=	-DHAVE_LIBXML2
+CFLAGS+=	-I/usr/local/include -I/usr/local/include/libxml2
+.if ${MK_BIND_LIBS} != "no"
+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}
+.endif
+.endif
+
 PTHREAD_DPADD=	${LIBPTHREAD}
 PTHREAD_LDADD=	-lpthread
-