Don't expose BIND libraries and their headers to the public by default,

but have a knob (WANT_BIND_LIBS) to build and install them in /usr/lib
and /usr/include.  Rumors are that this may be useful at a later point,
let's see.

What this really means is that all BIND libraries are now internal to
buildworld (by default, unless WANT_BIND_LIBS is defined), and linked
statically into various BIND executables.

While here, removed redundant -I's from CFLAGS in lib/bind makefiles.

Sponsored by:	des
OK'ed by:	dougb

1 files changed, 31 insertions, 2 deletions

diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 23ba65e..7968d90 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -13,10 +13,14 @@ CFLAGS+=	-DHAVE_CONFIG_H
 .if defined(SRCDIR) && exists(${SRCDIR}/api)
 .include	"${SRCDIR}/api"
 CFLAGS+=	-DLIBINTERFACE=${LIBINTERFACE}
-SHLIB_MAJOR=	${LIBINTERFACE}
 CFLAGS+=	-DLIBREVISION=${LIBREVISION}
-SHLIB_MINOR=	${LIBINTERFACE}
 CFLAGS+=	-DLIBAGE=${LIBAGE}
+.if defined(WANT_BIND_LIBS)
+SHLIB_MAJOR=	${LIBINTERFACE}
+SHLIB_MINOR=	${LIBINTERFACE}
+.else
+INTERNALLIB=	YES
+.endif
 .endif
 
 # GSSAPI support is incomplete in 9.3.0
@@ -57,9 +61,34 @@ CFLAGS+=	-I${LIB_BIND_DIR}
 .endif
 
 # Link against BIND libraries
+.if !defined(WANT_BIND_LIBS)
+LIBBIND9=	${LIB_BIND_REL}/bind9/libbind9.a
+CFLAGS+=	-I${BIND_DIR}/lib/bind9/include
+LIBDNS=		${LIB_BIND_REL}/dns/libdns.a
+CFLAGS+=	-I${BIND_DIR}/lib/dns/sec/dst/include \
+		-I${BIND_DIR}/lib/dns/include \
+		-I${LIB_BIND_DIR}/dns
+LIBISCCC=	${LIB_BIND_REL}/isccc/libisccc.a
+CFLAGS+=	-I${BIND_DIR}/lib/isccc/include
+LIBISCCFG=	${LIB_BIND_REL}/isccfg/libisccfg.a
+CFLAGS+=	-I${BIND_DIR}/lib/isccfg/include
+LIBISC=		${LIB_BIND_REL}/isc/libisc.a
+CFLAGS+=	-I${BIND_DIR}/lib/isc/unix/include \
+		-I${BIND_DIR}/lib/isc/pthreads/include \
+		-I${BIND_DIR}/lib/isc/include \
+		-I${LIB_BIND_DIR}/isc
+LIBLWRES=	${LIB_BIND_REL}/lwres/liblwres.a
+CFLAGS+=	-I${BIND_DIR}/lib/lwres/unix/include \
+		-I${BIND_DIR}/lib/lwres/include \
+		-I${LIB_BIND_DIR}/lwres
+.endif
 BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
 		${LIBISC} ${LIBLWRES}
+.if defined(WANT_BIND_LIBS)
 BIND_LDADD=	-lbind9 -ldns -lisccc -lisccfg -lisc -llwres
+.else
+BIND_LDADD=	${BIND_DPADD}
+.endif
 
 # Link against crypto library
 .if !defined(NOCRYPT)