From a76c49d66c57b5eaf1e70bb40e5709a8f05b56bf Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 16 Jan 2017 07:10:45 +0000
Subject: [PATCH] MFC r311140:

Only bake krb5_config.h support in to ssh(3), etc if both MK_GSSAPI and
MK_KERBEROS_SUPPORT != no

This fixes the odd case where someone specified MK_GSSAPI=no and
MK_KERBEROS_SUPPORT=yes (which admittedly, probably doesn't make sense,
but the build system doesn't prevent this case today, and it didn't when
I filed the bug back in 2011 either).

PR:		159745


git-svn-id: svn://svn.freebsd.org/base/stable/10@312269 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile.inc1                 | 2 +-
 secure/lib/libssh/Makefile    | 2 +-
 secure/usr.bin/ssh/Makefile   | 2 +-
 secure/usr.sbin/sshd/Makefile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f45ccb121..aa25470eb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1770,7 +1770,7 @@ secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_LDNS} != "no"
 secure/lib/libssh__L: lib/libldns__L
 .endif
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 92ba2bd29..9ee878edb 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -47,7 +47,7 @@ USEPRIVATELIB+= ldns
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 SRCS+=	 ssh_namespace.h
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	 krb5_config.h
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 24f02b314..99ade3486 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -27,7 +27,7 @@ LDADD+=	-lldns
 USEPRIVATELIB+= ldns
 .endif
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 DPADD+=	 ${LIBGSSAPI}
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 51a944a7d..93ae32bba 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -42,7 +42,7 @@ DPADD+=  ${LIBBSM}
 LDADD+=  -lbsm
 .endif
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 DPADD+=	 ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \
-- 
2.45.0