From owner-svn-src-all@FreeBSD.ORG  Sat Jul 16 07:12:03 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 26DC6106564A;
	Sat, 16 Jul 2011 07:12:03 +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 17EE88FC0A;
	Sat, 16 Jul 2011 07:12:03 +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 p6G7C2AE014623;
	Sat, 16 Jul 2011 07:12:02 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6G7C2oo014621;
	Sat, 16 Jul 2011 07:12:02 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107160712.p6G7C2oo014621@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 16 Jul 2011 07:12:02 +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: r224076 - head/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: Sat, 16 Jul 2011 07:12:03 -0000

Author: dougb
Date: Sat Jul 16 07:12:02 2011
New Revision: 224076
URL: http://svn.freebsd.org/changeset/base/224076

Log:
  Handle the MK_BIND_XML option more intelligently

Modified:
  head/lib/bind/config.mk

Modified: head/lib/bind/config.mk
==============================================================================
--- head/lib/bind/config.mk	Sat Jul 16 02:13:03 2011	(r224075)
+++ head/lib/bind/config.mk	Sat Jul 16 07:12:02 2011	(r224076)
@@ -78,11 +78,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"
@@ -120,5 +115,17 @@ 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"
+CFLAGS+=	-L/usr/local/lib
+BIND_LDADD+=	-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