summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2011-07-16 07:12:02 +0000
committerdougb <dougb@FreeBSD.org>2011-07-16 07:12:02 +0000
commit19de2b99a58030fa267a8bb2da9b3292dcf13a66 (patch)
tree22b34c307fb5ce8d949e687728e22dd47261f9d4 /lib
parent2d5817167b1945bae3a10d42fa3287571a882c3d (diff)
downloadFreeBSD-src-19de2b99a58030fa267a8bb2da9b3292dcf13a66.zip
FreeBSD-src-19de2b99a58030fa267a8bb2da9b3292dcf13a66.tar.gz
Handle the MK_BIND_XML option more intelligently
Diffstat (limited to 'lib')
-rw-r--r--lib/bind/config.mk17
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 184d017..fdf03a0 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -78,11 +78,6 @@ CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
.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
OpenPOWER on IntegriCloud