s4:heimdal_build: we need k5crypto and gssapi_krb5 aliases also when using system...

[samba.git] / source4 / heimdal_build / wscript_build

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index c2f7f6c50586a46429b1c65435991fb92e71deb4..f529c95a4039ab9c461f9b3455c8915e49d8880f 100644 (file)
--- 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')