Fix conflicts after heimdal-1.1 import and add build infrastructure. Import

all non-style changes made by heimdal to our own libgssapi.

1 files changed, 10 insertions, 4 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5997fec1598b..24206874635a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1036,7 +1036,8 @@ _startup_libs+=	lib/libc
 gnu/lib/libgcc__L: lib/libc__L
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
-		${_kerberos5_lib_libroken} \
+		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \
+		${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \
 		lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
@@ -1068,9 +1069,11 @@ lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_KERBEROS} != "no"
-secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
-    kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \
-    kerberos5/lib/libroken__L
+kerberos5/lib/libgssapi_krb5__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
+secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
 .endif
 .endif
 .endif
@@ -1085,7 +1088,10 @@ _lib_libipx=	lib/libipx
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1
 _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
+_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