Module Name: src
Committed By: mrg
Date: Thu Oct 3 20:11:34 UTC 2013
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
use LIBDPLIBS instead of LDADD/DPADD to link against the heimdal
libraries. fixes build issues.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.16 src/external/bsd/bind/Makefile.inc:1.17
--- src/external/bsd/bind/Makefile.inc:1.16 Sun Aug 11 14:42:04 2013
+++ src/external/bsd/bind/Makefile.inc Thu Oct 3 20:11:34 2013
@@ -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+=-DOPENSSL -DUSE_ISC_SPNEGO
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
