[src/trunk]: src/external/bsd/bind use LIBDPLIBS instead of LDADD/DPADD to li...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cbbadf06d5b9
branches:  trunk
changeset: 790335:cbbadf06d5b9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Oct 03 20:11:34 2013 +0000

description:
use LIBDPLIBS instead of LDADD/DPADD to link against the heimdal
libraries.  fixes build issues.

diffstat:

 external/bsd/bind/Makefile.inc |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 31ed7da26c4f -r cbbadf06d5b9 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc    Thu Oct 03 20:11:16 2013 +0000
+++ b/external/bsd/bind/Makefile.inc    Thu Oct 03 20:11:34 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.16 2013/08/11 14:42:04 tsutsui Exp $
+#      $NetBSD: Makefile.inc,v 1.17 2013/10/03 20:11:34 mrg Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -94,10 +94,22 @@
 CPPFLAGS+=-DGSSAPI
 .endif
 .if ${MKKERBEROS} != "no"
+.if !defined (LIB) || empty(LIB)
 LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
        -lcom_err  -lroken -lasn1 -lwind
 DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
        ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
+.else
+LIBDPLIBS+=    gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi \
+               krb5 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libkrb5 \
+               hx509 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libhx509 \
+               heimntlm ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libheimntlm \
+               heimbase ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libheimbase \
+               com_err ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libcom_err \
+               roken ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libroken \
+               asn1 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libasn1 \
+               wind ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libwind
+.endif
 .endif
 .if !defined (LIB) || empty(LIB)
 LDADD+= -lcrypto -lcrypt