diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-14 15:55:32 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-14 20:11:22 +0200 |
| commit | 796f5727edff192493b0021fd7b0d5ea9e3e1e94 (patch) | |
| tree | 25c3fa820bb049cd97989c06bb41dfbc3499a47e | |
| parent | 8ee1c2492a1d3ab67cec5da60441f3e44ebaa286 (diff) | |
| download | samba-796f5727edff192493b0021fd7b0d5ea9e3e1e94.tar.gz samba-796f5727edff192493b0021fd7b0d5ea9e3e1e94.tar.bz2 samba-796f5727edff192493b0021fd7b0d5ea9e3e1e94.zip | |
s4:heimdal_build: we need k5crypto and gssapi_krb5 aliases also when using system libraries
metze
| -rw-r--r-- | source4/heimdal_build/wscript_build | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index c2f7f6c505..f529c95a40 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -663,13 +663,6 @@ 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', @@ -682,12 +675,6 @@ 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 @@ -961,3 +948,10 @@ HEIMDAL_BINARY('samba4kpasswd', deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto', install=False ) + +# Alias subsystem to allow common kerberos code that will +# otherwise link against MIT's gssapi_krb5 and k5crypto +# +# Note: that we also need this if we use system heimdal libraries +HEIMDAL_SUBSYSTEM('gssapi_krb5', '', deps='gssapi') +HEIMDAL_SUBSYSTEM('k5crypto', '', deps='krb5') |