svn commit: r224076 - head/lib/bind

[Doug Barton]

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