summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-21 12:28:27 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-26 11:29:29 +1000
commitad6ee6d55abaeb0eb4373b148fd7e000bfbff194 (patch)
tree6040c3bc3655fb036504dd4968fce29466f453ee /source4
parentd00f1febd50b4779e8c5588055ee1f601448550c (diff)
downloadsamba-ad6ee6d55abaeb0eb4373b148fd7e000bfbff194.tar.gz
samba-ad6ee6d55abaeb0eb4373b148fd7e000bfbff194.tar.bz2
samba-ad6ee6d55abaeb0eb4373b148fd7e000bfbff194.zip
build: Move Heimdal/MIT compat build rules to heimdal_build
This allows top level build rules to rely on these names at all times. Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_build13
1 files changed, 13 insertions, 0 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index a1bd4783b0..b52acd6661 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -621,6 +621,13 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
version.c warn.c krb5_err.c
heim_err.c k524_err.c krb_err.c''')] + ["../heimdal_build/krb5-glue.c"]
+ # Alias subsystem to allow common kerberos code that will
+ # otherwise link against MIT's gssapi_krb5
+ HEIMDAL_SUBSYSTEM('gssapi_krb5',
+ '',
+ deps='gssapi'
+ )
+
HEIMDAL_LIBRARY('krb5', KRB5_SOURCE,
version_script='lib/krb5/version-script.map',
includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
@@ -633,6 +640,12 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
HEIMDAL_AUTOPROTO('lib/krb5/krb5-protos.h', KRB5_PROTO_SOURCE,
options='-E KRB5_LIB -q -P comment -o')
+ # Alias subsystem to allow common kerberos code that will
+ # otherwise link against MIT's k5crypto
+ HEIMDAL_SUBSYSTEM('k5crypto',
+ '',
+ deps='krb5')
+
if not bld.CONFIG_SET("USING_SYSTEM_ASN1"):
HEIMDAL_HEIM_ASN1_DER_SOURCE = '''
lib/asn1/der_get.c