Module Name: src
Committed By: dholland
Date: Mon Jul 29 16:42:20 UTC 2013
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/dhcp: Makefile.inc
Log Message:
Fix MKKERBEROS=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/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.14 src/external/bsd/bind/Makefile.inc:1.15
--- src/external/bsd/bind/Makefile.inc:1.14 Sat Jul 27 19:23:09 2013
+++ src/external/bsd/bind/Makefile.inc Mon Jul 29 16:42:20 2013
@@ -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 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR
.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
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.5 src/external/bsd/dhcp/Makefile.inc:1.6
--- src/external/bsd/dhcp/Makefile.inc:1.5 Sat Jul 27 18:16:26 2013
+++ src/external/bsd/dhcp/Makefile.inc Mon Jul 29 16:42:20 2013
@@ -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+=-lpthread
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
