diff options
Diffstat (limited to 'source4/heimdal_build/wscript_build')
| -rw-r--r-- | source4/heimdal_build/wscript_build | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index a1bd4783b0..705caa52e2 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -400,12 +400,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'): ../heimdal_build/replace.c ''' - if not bld.CONFIG_SET('HAVE_GETPROGNAME'): - ROKEN_HOSTCC_SOURCE += ''' - lib/roken/getprogname.c - lib/roken/setprogname.c - ''' - if not bld.CONFIG_SET('HAVE_CLOSEFROM'): ROKEN_HOSTCC_SOURCE += ''' lib/roken/closefrom.c @@ -621,6 +615,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 +634,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 |