[src/trunk]: src/external/bsd Fix MKKERBEROS=no build.

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

details:   https://anonhg.NetBSD.org/src/rev/d57a6fc6a3a7
branches:  trunk
changeset: 788930:d57a6fc6a3a7
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jul 29 16:42:20 2013 +0000

description:
Fix MKKERBEROS=no build.

diffstat:

 external/bsd/bind/Makefile.inc |  15 +++++++++++----
 external/bsd/dhcp/Makefile.inc |  10 +++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r d5d3ff3e6467 -r d57a6fc6a3a7 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc    Mon Jul 29 16:40:46 2013 +0000
+++ b/external/bsd/bind/Makefile.inc    Mon Jul 29 16:42:20 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2013/07/27 19:23:09 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2013/07/29 16:42:20 dholland Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -89,10 +89,17 @@
 .endif
 
 .if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL -DGSSAPI -DUSE_ISC_SPNEGO
+CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
+.if ${MKKERBEROS} != "no"
+CPPFLAGS+=-DGSSAPI
+.endif
+.if ${MKKERBEROS} != "no"
+LDADD+= -lgssapi -lkrb5
+DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+.endif
 .if !defined (LIB) || empty(LIB)
-LDADD+= -lgssapi -lkrb5 -lcrypto
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBCRYPTO}
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
 .else
 .if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
 LIBDPLIBS+=    crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
diff -r d5d3ff3e6467 -r d57a6fc6a3a7 external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Mon Jul 29 16:40:46 2013 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Mon Jul 29 16:42:20 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2013/07/27 18:16:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2013/07/29 16:42:20 dholland Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -40,8 +40,12 @@
 LDADD+=-Wl,-Bdynamic
 .endif
 .if (${MKCRYPTO} != "no")
-LDADD+= -lgssapi -lkrb5 -lcrypto -lipsec
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBCRYPTO} ${LIBIPSEC}
+.if (${MKKERBEROS} != "no")
+LDADD+= -lgssapi -lkrb5
+DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+.endif
+LDADD+= -lcrypto -lipsec
+DPADD+= ${LIBCRYPTO} ${LIBIPSEC}
 .endif
 DPADD+= ${COBJDIR}/libdhcp.a
 DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a