From c1f5e7308adac17aee8515cef97d9ca55cfe4c15 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 23 Jan 2010 19:29:42 +0000
Subject: [PATCH] Unbreak world: - WITHOUT_OPENSSH (and WITH_KERBEROS) -
 WITHOUT_KERBEROS and WITH_GSSAPI

PR:		137483
Submitted by:	bf
MFC after:	2 weeks

Note: this breaks harder world WITHOUT_GSSAPI (and WITH_KERBEROS), but well
---
 Makefile.inc1 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index a26884450c8d..7e6cea257c39 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1136,14 +1136,16 @@ _cddl_lib= cddl/lib
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-.if ${MK_OPENSSH} != "no"
-_secure_lib_libssh= secure/lib/libssh
-secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_KERBEROS} != "no"
 kerberos5/lib/libgssapi_krb5__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 secure/lib/libcrypto__L \
     lib/libcrypt__L
+.endif
+.if ${MK_OPENSSH} != "no"
+_secure_lib_libssh= secure/lib/libssh
+secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
+.if ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
 .endif
 .endif
@@ -1151,6 +1153,10 @@ secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
 _secure_lib=	secure/lib
 .endif
 
+.if ${MK_GSSAPI} != "no"
+_lib_libgssapi=	lib/libgssapi
+.endif
+
 .if ${MK_IPX} != "no"
 _lib_libipx=	lib/libipx
 .endif
@@ -1163,7 +1169,6 @@ _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
 _kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
-_lib_libgssapi=	lib/libgssapi
 .endif
 
 .if ${MK_NIS} != "no"