wafsamba: Move heimdal library code to heimdal_build.

2 files changed, 274 insertions, 270 deletions

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index db5445c774..76c1b3299d 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -117,9 +117,6 @@ def SAMBA_LIBRARY(bld, libname, source,
                   hide_symbols=False,
                   is_bundled=False,
                   manpages=None,
-                  heimdal_autoproto=None,
-                  heimdal_autoproto_options=None,
-                  heimdal_autoproto_private=None,
                   enabled=True):
     '''define a Samba library'''
 
@@ -220,11 +217,6 @@ def SAMBA_LIBRARY(bld, libname, source,
     if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
         bld.MANPAGES(manpages)
 
-    if heimdal_autoproto is not None:
-        bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source, options=heimdal_autoproto_options)
-    if heimdal_autoproto_private is not None:
-        bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
-
 
 Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
 
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f011d95d55..2c7b01378d 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -1,5 +1,25 @@
 #!/usr/bin/env python
 
+import Build
+
+def HEIMDAL_LIBRARY(bld, libname, source, deps,
+                  includes='',
+                  public_deps='',
+                  cflags='',
+                  heimdal_autoproto=None,
+                  heimdal_autoproto_options=None,
+                  heimdal_autoproto_private=None):
+    bld.SAMBA_LIBRARY(libname=libname, source=source, deps=deps,
+        public_deps=public_deps, cflags=cflags, includes=includes,
+        is_bundled=True)
+    if heimdal_autoproto is not None:
+        bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source,
+            options=heimdal_autoproto_options)
+    if heimdal_autoproto_private is not None:
+        bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
+
+Build.BuildContext.HEIMDAL_LIBRARY = HEIMDAL_LIBRARY
+
 bld.SAMBA_GENERATOR(
     name="HEIMDAL_ERRORLIST",
     rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()} ${SRC[1].parent.abspath(env)}",
@@ -40,217 +60,214 @@ bld.SAMBA_GENERATOR(
 
 bld.SAMBA_ASN1('HEIMDAL_SPNEGO_ASN1',
         source='../heimdal/lib/gssapi/spnego/spnego.asn1',
-	options='--sequence=MechTypeList',
+    options='--sequence=MechTypeList',
         includes='../heimdal/lib/asn1',
-	directory='lib/gssapi'
-	)
+    directory='lib/gssapi'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_GSSAPI_ASN1',
-	'../heimdal/lib/gssapi/mech/gssapi.asn1',
+    '../heimdal/lib/gssapi/mech/gssapi.asn1',
         includes='../heimdal/lib/asn1',
-	directory='lib/gssapi'
-	)
+    directory='lib/gssapi'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_KRB5_ASN1',
-	'../heimdal/lib/asn1/krb5.asn1',
-	option_file='../heimdal/lib/asn1/krb5.opt',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/krb5.asn1',
+    option_file='../heimdal/lib/asn1/krb5.opt',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_DIGEST_ASN1',
-	'../heimdal/lib/asn1/digest.asn1',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/digest.asn1',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_PKCS8_ASN1',
-	'../heimdal/lib/asn1/pkcs8.asn1',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/pkcs8.asn1',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_PKCS9_ASN1',
-	'../heimdal/lib/asn1/pkcs9.asn1',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/pkcs9.asn1',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_PKCS12_ASN1',
-	'../heimdal/lib/asn1/pkcs12.asn1',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/pkcs12.asn1',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_RFC2459_ASN1',
-	'../heimdal/lib/asn1/rfc2459.asn1',
-	options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/rfc2459.asn1',
+    options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_PKINIT_ASN1',
-	'../heimdal/lib/asn1/pkinit.asn1',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/pkinit.asn1',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_CMS_ASN1',
-	'../heimdal/lib/asn1/cms.asn1',
-	option_file='../heimdal/lib/asn1/cms.opt',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/cms.asn1',
+    option_file='../heimdal/lib/asn1/cms.opt',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_OCSP_ASN1',
-	'../heimdal/lib/hx509/ocsp.asn1',
-	options='--preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData',
+    '../heimdal/lib/hx509/ocsp.asn1',
+    options='--preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData',
         includes='../heimdal/lib/asn1',
-	directory='lib/hx509'
-	)
+    directory='lib/hx509'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_KX509_ASN1',
-	'../heimdal/lib/asn1/kx509.asn1',
-	directory='lib/asn1'
-	)
+    '../heimdal/lib/asn1/kx509.asn1',
+    directory='lib/asn1'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_PKCS10_ASN1',
-	'../heimdal/lib/hx509/pkcs10.asn1',
-	options='--preserve-binary=CertificationRequestInfo',
+    '../heimdal/lib/hx509/pkcs10.asn1',
+    options='--preserve-binary=CertificationRequestInfo',
         includes='../heimdal/lib/asn1',
-	directory='lib/hx509'
-	)
+    directory='lib/hx509'
+    )
 
 
 bld.SAMBA_ASN1('HEIMDAL_HDB_ASN1',
-	'../heimdal/lib/hdb/hdb.asn1',
+    '../heimdal/lib/hdb/hdb.asn1',
         includes='../heimdal/lib/asn1')
 
 bld.SAMBA_ERRTABLE('HEIMDAL_ASN1_ERR_ET',
-	'../heimdal/lib/asn1/asn1_err.et')
+    '../heimdal/lib/asn1/asn1_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_HDB_ERR_ET',
-	'../heimdal/lib/hdb/hdb_err.et')
+    '../heimdal/lib/hdb/hdb_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_HEIM_ERR_ET',
-	'../heimdal/lib/krb5/heim_err.et')
+    '../heimdal/lib/krb5/heim_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_K524_ERR_ET',
-	'../heimdal/lib/krb5/k524_err.et')
+    '../heimdal/lib/krb5/k524_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_KRB_ERR_ET',
-	'../heimdal/lib/krb5/krb_err.et')
+    '../heimdal/lib/krb5/krb_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_KRB5_ERR_ET',
-	'../heimdal/lib/krb5/krb5_err.et')
+    '../heimdal/lib/krb5/krb5_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_GKRB5_ERR_ET',
-	'../heimdal/lib/gssapi/krb5/gkrb5_err.et')
+    '../heimdal/lib/gssapi/krb5/gkrb5_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_HX509_ERR_ET',
-	'../heimdal/lib/hx509/hx509_err.et')
+    '../heimdal/lib/hx509/hx509_err.et')
 
 
 bld.SAMBA_ERRTABLE('HEIMDAL_WIND_ERR_ET',
-	'../heimdal/lib/wind/wind_err.et')
+    '../heimdal/lib/wind/wind_err.et')
 
 HEIMDAL_ROKEN_HOSTCC_SOURCE = '''
-	../heimdal/lib/roken/base64.c
-	../heimdal/lib/roken/ct.c
-	../heimdal/lib/roken/hex.c
-	../heimdal/lib/roken/bswap.c
-	../heimdal/lib/roken/dumpdata.c
-	../heimdal/lib/roken/emalloc.c
-	../heimdal/lib/roken/ecalloc.c
-	../heimdal/lib/roken/getarg.c
-	../heimdal/lib/roken/get_window_size.c
-	../heimdal/lib/roken/getdtablesize.c
-	../heimdal/lib/roken/h_errno.c
-	../heimdal/lib/roken/issuid.c
-	../heimdal/lib/roken/net_read.c
-	../heimdal/lib/roken/net_write.c
-	../heimdal/lib/roken/parse_time.c
-	../heimdal/lib/roken/parse_units.c
-	../heimdal/lib/roken/signal.c
-	../heimdal/lib/roken/vis.c
-	../heimdal/lib/roken/strlwr.c
-	../heimdal/lib/roken/strsep_copy.c
-	../heimdal/lib/roken/strsep.c
-	../heimdal/lib/roken/strupr.c
-	../heimdal/lib/roken/strpool.c
-	../heimdal/lib/roken/estrdup.c
-	../heimdal/lib/roken/erealloc.c
-	../heimdal/lib/roken/simple_exec.c
-	../heimdal/lib/roken/strcollect.c
-	../heimdal/lib/roken/rtbl.c
-	../heimdal/lib/roken/cloexec.c
-	../heimdal/lib/roken/xfree.c
-	replace.c
+    ../heimdal/lib/roken/base64.c
+    ../heimdal/lib/roken/ct.c
+    ../heimdal/lib/roken/hex.c
+    ../heimdal/lib/roken/bswap.c
+    ../heimdal/lib/roken/dumpdata.c
+    ../heimdal/lib/roken/emalloc.c
+    ../heimdal/lib/roken/ecalloc.c
+    ../heimdal/lib/roken/getarg.c
+    ../heimdal/lib/roken/get_window_size.c
+    ../heimdal/lib/roken/getdtablesize.c
+    ../heimdal/lib/roken/h_errno.c
+    ../heimdal/lib/roken/issuid.c
+    ../heimdal/lib/roken/net_read.c
+    ../heimdal/lib/roken/net_write.c
+    ../heimdal/lib/roken/parse_time.c
+    ../heimdal/lib/roken/parse_units.c
+    ../heimdal/lib/roken/signal.c
+    ../heimdal/lib/roken/vis.c
+    ../heimdal/lib/roken/strlwr.c
+    ../heimdal/lib/roken/strsep_copy.c
+    ../heimdal/lib/roken/strsep.c
+    ../heimdal/lib/roken/strupr.c
+    ../heimdal/lib/roken/strpool.c
+    ../heimdal/lib/roken/estrdup.c
+    ../heimdal/lib/roken/erealloc.c
+    ../heimdal/lib/roken/simple_exec.c
+    ../heimdal/lib/roken/strcollect.c
+    ../heimdal/lib/roken/rtbl.c
+    ../heimdal/lib/roken/cloexec.c
+    ../heimdal/lib/roken/xfree.c
+    replace.c
 '''
 
 if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
-	HEIMDAL_ROKEN_HOSTCC_SOURCE += '''
-		../heimdal/lib/roken/getprogname.c
-		../heimdal/lib/roken/setprogname.c
-	'''
+    HEIMDAL_ROKEN_HOSTCC_SOURCE += '''
+        ../heimdal/lib/roken/getprogname.c
+        ../heimdal/lib/roken/setprogname.c
+    '''
 
 if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
-	HEIMDAL_ROKEN_HOSTCC_SOURCE += '''
-		../heimdal/lib/roken/closefrom.c
-	'''
+    HEIMDAL_ROKEN_HOSTCC_SOURCE += '''
+        ../heimdal/lib/roken/closefrom.c
+    '''
 
 HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_HOSTCC_SOURCE + '''
-	../heimdal/lib/roken/resolve.c
-	../heimdal/lib/roken/socket.c
-	../heimdal/lib/roken/roken_gethostby.c
+    ../heimdal/lib/roken/resolve.c
+    ../heimdal/lib/roken/socket.c
+    ../heimdal/lib/roken/roken_gethostby.c
 '''
 
-bld.SAMBA_LIBRARY('HEIMDAL_ROKEN',
-	HEIMDAL_ROKEN_SOURCE,
-	includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
-	deps='resolv UID_WRAPPER util',
-	is_bundled=True,
-	)
+bld.HEIMDAL_LIBRARY('HEIMDAL_ROKEN',
+    HEIMDAL_ROKEN_SOURCE,
+    includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
+    deps='resolv UID_WRAPPER util',
+    )
 
 
-bld.SAMBA_LIBRARY('HEIMDAL_KDC',
+bld.HEIMDAL_LIBRARY('HEIMDAL_KDC',
                     source='../heimdal/kdc/default_config.c ../heimdal/kdc/kerberos5.c ../heimdal/kdc/krb5tgs.c ../heimdal/kdc/pkinit.c ../heimdal/kdc/log.c ../heimdal/kdc/misc.c ../heimdal/kdc/kaserver.c ../heimdal/kdc/digest.c ../heimdal/kdc/process.c ../heimdal/kdc/windc.c ../heimdal/kdc/kx509.c',
                     includes='../heimdal/kdc',
                     heimdal_autoproto='../heimdal/kdc/kdc-protos.h',
                     heimdal_autoproto_private='../heimdal/kdc/kdc-private.h',
                     deps='HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 HEIMDAL_NTLM HEIMDAL_HCRYPTO',
-					is_bundled=True,
                     )
 
 
-bld.SAMBA_LIBRARY('HEIMDAL_NTLM',
+bld.HEIMDAL_LIBRARY('HEIMDAL_NTLM',
                     source='../heimdal/lib/ntlm/ntlm.c',
                     includes='../heimdal/lib/ntlm',
                     heimdal_autoproto='../heimdal/lib/ntlm/heimntlm-protos.h',
                     deps='HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5',
-					is_bundled=True,
-	)
+    )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HDB_KEYS',
-	'../heimdal/lib/hdb/keys.c',
-	includes='../heimdal/lib/hdb',
-	deps='HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 HEIMDAL_HDB_ASN1'
-	)
+    '../heimdal/lib/hdb/keys.c',
+    includes='../heimdal/lib/hdb',
+    deps='HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 HEIMDAL_HDB_ASN1'
+    )
 
 
-bld.SAMBA_LIBRARY('HEIMDAL_HDB',
+bld.HEIMDAL_LIBRARY('HEIMDAL_HDB',
                     source='''../heimdal/lib/hdb/db.c ../heimdal/lib/hdb/dbinfo.c ../heimdal/lib/hdb/hdb.c
                               ../heimdal/lib/hdb/ext.c ../heimdal/lib/hdb/keytab.c ../heimdal/lib/hdb/hdb-keytab.c
                               ../heimdal/lib/hdb/mkey.c ../heimdal/lib/hdb/ndbm.c ../heimdal/lib/hdb/hdb_err.c
@@ -259,11 +276,10 @@ bld.SAMBA_LIBRARY('HEIMDAL_HDB',
                     heimdal_autoproto='../heimdal/lib/hdb/hdb-protos.h',
                     heimdal_autoproto_private='../heimdal/lib/hdb/hdb-private.h',
                     deps='HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1',
-					is_bundled=True,
-	)
+    )
 
 
-bld.SAMBA_LIBRARY('HEIMDAL_GSSAPI',
+bld.HEIMDAL_LIBRARY('HEIMDAL_GSSAPI',
                     '''
 ../heimdal/lib/gssapi/spnego/init_sec_context.c ../heimdal/lib/gssapi/spnego/external.c ../heimdal/lib/gssapi/spnego/compat.c
 ../heimdal/lib/gssapi/spnego/context_stubs.c ../heimdal/lib/gssapi/spnego/cred_stubs.c ../heimdal/lib/gssapi/spnego/accept_sec_context.c
@@ -304,10 +320,9 @@ bld.SAMBA_LIBRARY('HEIMDAL_GSSAPI',
 ../heimdal/lib/gssapi/mech/gss_import_name.c ../heimdal/lib/gssapi/mech/gss_duplicate_name.c ../heimdal/lib/gssapi/mech/gss_unwrap.c
 ../heimdal/lib/gssapi/mech/gss_export_sec_context.c ../heimdal/lib/gssapi/mech/gss_inquire_context.c ../heimdal/lib/gssapi/mech/gss_release_name.c
 ../heimdal/lib/gssapi/mech/gss_set_cred_option.c  ../heimdal/lib/gssapi/mech/gss_pseudo_random.c gssapi-glue.c''',
-	includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech',
-	deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 HEIMDAL_ROKEN HEIMDAL_KRB5',
-	is_bundled=True,
-	)
+    includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech',
+    deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 HEIMDAL_ROKEN HEIMDAL_KRB5',
+    )
 
 
 bld.SAMBA_GENERATOR(
@@ -327,7 +342,7 @@ bld.SAMBA_GENERATOR(
     enabled = not bld.CONFIG_SET('HAVE_ERR_H')
     )
 
-bld.SAMBA_LIBRARY('HEIMDAL_KRB5',
+bld.HEIMDAL_LIBRARY('HEIMDAL_KRB5',
                     bld.SUBDIR('../heimdal/lib/krb5/',
                                '''acache.c add_et_list.c
                                addr_families.c appdefault.c
@@ -338,7 +353,7 @@ bld.SAMBA_LIBRARY('HEIMDAL_KRB5',
                                copy_host_realm.c crc.c creds.c
                                crypto.c data.c eai_to_heim_errno.c
                                error_string.c expand_hostname.c
-							   expand_path.c
+                               expand_path.c
                                fcache.c free.c free_host_realm.c
                                generate_seq_number.c generate_subkey.c
                                get_addrs.c get_cred.c
@@ -365,125 +380,122 @@ bld.SAMBA_LIBRARY('HEIMDAL_KRB5',
                     heimdal_autoproto='../heimdal/lib/krb5/krb5-protos.h',
                     heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o',
                     heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h',
-		    cflags = bld.dynconfig_cflags(),
-		    deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl',
-			is_bundled=True,
+            cflags = bld.dynconfig_cflags(),
+            deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl',
                     )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HEIM_ASN1',
-	'../heimdal/lib/asn1/der_get.c ../heimdal/lib/asn1/der_put.c ../heimdal/lib/asn1/der_free.c ../heimdal/lib/asn1/der_format.c ../heimdal/lib/asn1/der_length.c ../heimdal/lib/asn1/der_copy.c ../heimdal/lib/asn1/der_cmp.c ../heimdal/lib/asn1/extra.c ../heimdal/lib/asn1/timegm.c ../heimdal/lib/asn1/asn1_err.c',
+    '../heimdal/lib/asn1/der_get.c ../heimdal/lib/asn1/der_put.c ../heimdal/lib/asn1/der_free.c ../heimdal/lib/asn1/der_format.c ../heimdal/lib/asn1/der_length.c ../heimdal/lib/asn1/der_copy.c ../heimdal/lib/asn1/der_cmp.c ../heimdal/lib/asn1/extra.c ../heimdal/lib/asn1/timegm.c ../heimdal/lib/asn1/asn1_err.c',
         includes='../heimdal/lib/asn1',
-	deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR'
-	)
+    deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR'
+    )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO_IMATH',
-	'../heimdal/lib/hcrypto/imath/imath.c ../heimdal/lib/hcrypto/imath/iprime.c',
+    '../heimdal/lib/hcrypto/imath/imath.c ../heimdal/lib/hcrypto/imath/iprime.c',
         includes='../heimdal/lib/hcrypto/imath',
-	deps='HEIMDAL_ROKEN'
-	)
+    deps='HEIMDAL_ROKEN'
+    )
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO_LTM',
-	'../heimdal/lib/hcrypto/libtommath/bncore.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clear.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exch.c ../heimdal/lib/hcrypto/libtommath/bn_mp_grow.c ../heimdal/lib/hcrypto/libtommath/bn_mp_shrink.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clamp.c ../heimdal/lib/hcrypto/libtommath/bn_mp_zero.c ../heimdal/lib/hcrypto/libtommath/bn_mp_zero_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_set.c ../heimdal/lib/hcrypto/libtommath/bn_mp_set_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_copy.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_copy.c ../heimdal/lib/hcrypto/libtommath/bn_mp_abs.c ../heimdal/lib/hcrypto/libtommath/bn_mp_neg.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp_mag.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_rshd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_lshd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_2.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_2.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_add.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_sub.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_mul_digs.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_mul_digs.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_mul_high_digs.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_mul_high_digs.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_add.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sub.c ../heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_add_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sub_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_expt_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_addmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_submod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mulmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqrmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_gcd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_lcm.c ../heimdal/lib/hcrypto/libtommath/bn_fast_mp_invmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_invmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_setup.c ../heimdal/lib/hcrypto/libtommath/bn_fast_mp_montgomery_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exptmod_fast.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exptmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_2expt.c ../heimdal/lib/hcrypto/libtommath/bn_mp_n_root.c ../heimdal/lib/hcrypto/libtommath/bn_mp_jacobi.c ../heimdal/lib/hcrypto/libtommath/bn_reverse.c ../heimdal/lib/hcrypto/libtommath/bn_mp_count_bits.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_unsigned_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_signed_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_signed_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_unsigned_bin_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_signed_bin_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_xor.c ../heimdal/lib/hcrypto/libtommath/bn_mp_and.c ../heimdal/lib/hcrypto/libtommath/bn_mp_or.c ../heimdal/lib/hcrypto/libtommath/bn_mp_rand.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_calc_normalization.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_is_divisible.c ../heimdal/lib/hcrypto/libtommath/bn_prime_tab.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_fermat.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_miller_rabin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_is_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_next_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_find_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_isprime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_is_modulus.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toom_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toom_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_3.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_exptmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_is_2k.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_is_2k_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_radix_smap.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_radix.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toradix.c ../heimdal/lib/hcrypto/libtommath/bn_mp_radix_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_fread.c ../heimdal/lib/hcrypto/libtommath/bn_mp_fwrite.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cnt_lsb.c ../heimdal/lib/hcrypto/libtommath/bn_error.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clear_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exteuclid.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toradix_n.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_random_ex.c ../heimdal/lib/hcrypto/libtommath/bn_mp_get_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqrt.c ../heimdal/lib/hcrypto/libtommath/bn_mp_is_square.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_set.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_set_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_invmod_slow.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_rabin_miller_trials.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_signed_bin_n.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin_n.c',
+    '../heimdal/lib/hcrypto/libtommath/bncore.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clear.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exch.c ../heimdal/lib/hcrypto/libtommath/bn_mp_grow.c ../heimdal/lib/hcrypto/libtommath/bn_mp_shrink.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clamp.c ../heimdal/lib/hcrypto/libtommath/bn_mp_zero.c ../heimdal/lib/hcrypto/libtommath/bn_mp_zero_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_set.c ../heimdal/lib/hcrypto/libtommath/bn_mp_set_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_copy.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_copy.c ../heimdal/lib/hcrypto/libtommath/bn_mp_abs.c ../heimdal/lib/hcrypto/libtommath/bn_mp_neg.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp_mag.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_rshd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_lshd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_2.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_2.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_add.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_sub.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_mul_digs.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_mul_digs.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_mul_high_digs.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_mul_high_digs.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_add.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sub.c ../heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_add_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sub_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_expt_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_addmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_submod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mulmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqrmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_gcd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_lcm.c ../heimdal/lib/hcrypto/libtommath/bn_fast_mp_invmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_invmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_setup.c ../heimdal/lib/hcrypto/libtommath/bn_fast_mp_montgomery_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exptmod_fast.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exptmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_2expt.c ../heimdal/lib/hcrypto/libtommath/bn_mp_n_root.c ../heimdal/lib/hcrypto/libtommath/bn_mp_jacobi.c ../heimdal/lib/hcrypto/libtommath/bn_reverse.c ../heimdal/lib/hcrypto/libtommath/bn_mp_count_bits.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_unsigned_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_signed_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_signed_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_unsigned_bin_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_signed_bin_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_xor.c ../heimdal/lib/hcrypto/libtommath/bn_mp_and.c ../heimdal/lib/hcrypto/libtommath/bn_mp_or.c ../heimdal/lib/hcrypto/libtommath/bn_mp_rand.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_calc_normalization.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_is_divisible.c ../heimdal/lib/hcrypto/libtommath/bn_prime_tab.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_fermat.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_miller_rabin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_is_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_next_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_find_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_isprime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_is_modulus.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toom_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toom_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_3.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_exptmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_is_2k.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_is_2k_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_radix_smap.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_radix.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toradix.c ../heimdal/lib/hcrypto/libtommath/bn_mp_radix_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_fread.c ../heimdal/lib/hcrypto/libtommath/bn_mp_fwrite.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cnt_lsb.c ../heimdal/lib/hcrypto/libtommath/bn_error.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clear_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exteuclid.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toradix_n.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_random_ex.c ../heimdal/lib/hcrypto/libtommath/bn_mp_get_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqrt.c ../heimdal/lib/hcrypto/libtommath/bn_mp_is_square.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_set.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_set_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_invmod_slow.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_rabin_miller_trials.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_signed_bin_n.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin_n.c',
         includes='../heimdal/lib/hcrypto/libtommath'
-	)
+    )
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO',
-	'../heimdal/lib/hcrypto/aes.c ../heimdal/lib/hcrypto/bn.c ../heimdal/lib/hcrypto/dh.c ../heimdal/lib/hcrypto/dh-ltm.c ../heimdal/lib/hcrypto/dh-imath.c ../heimdal/lib/hcrypto/des.c ../heimdal/lib/hcrypto/dsa.c ../heimdal/lib/hcrypto/engine.c ../heimdal/lib/hcrypto/md2.c ../heimdal/lib/hcrypto/md4.c ../heimdal/lib/hcrypto/md5.c ../heimdal/lib/hcrypto/rsa.c ../heimdal/lib/hcrypto/rsa-ltm.c ../heimdal/lib/hcrypto/rsa-imath.c ../heimdal/lib/hcrypto/rc2.c ../heimdal/lib/hcrypto/rc4.c ../heimdal/lib/hcrypto/rijndael-alg-fst.c ../heimdal/lib/hcrypto/rnd_keys.c ../heimdal/lib/hcrypto/sha.c ../heimdal/lib/hcrypto/sha256.c ../heimdal/lib/hcrypto/sha512.c ../heimdal/lib/hcrypto/ui.c ../heimdal/lib/hcrypto/evp.c ../heimdal/lib/hcrypto/evp-hcrypto.c ../heimdal/lib/hcrypto/pkcs5.c ../heimdal/lib/hcrypto/pkcs12.c ../heimdal/lib/hcrypto/rand.c ../heimdal/lib/hcrypto/rand-egd.c ../heimdal/lib/hcrypto/rand-unix.c ../heimdal/lib/hcrypto/rand-fortuna.c ../heimdal/lib/hcrypto/rand-timer.c ../heimdal/lib/hcrypto/hmac.c ../heimdal/lib/hcrypto/camellia.c ../heimdal/lib/hcrypto/camellia-ntt.c ../heimdal/lib/hcrypto/common.c ../heimdal/lib/hcrypto/validate.c',
-	includes='../heimdal/lib/hcrypto ../heimdal/lib',
-	deps='HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1 HEIMDAL_HCRYPTO_LTM'
-	)
+    '../heimdal/lib/hcrypto/aes.c ../heimdal/lib/hcrypto/bn.c ../heimdal/lib/hcrypto/dh.c ../heimdal/lib/hcrypto/dh-ltm.c ../heimdal/lib/hcrypto/dh-imath.c ../heimdal/lib/hcrypto/des.c ../heimdal/lib/hcrypto/dsa.c ../heimdal/lib/hcrypto/engine.c ../heimdal/lib/hcrypto/md2.c ../heimdal/lib/hcrypto/md4.c ../heimdal/lib/hcrypto/md5.c ../heimdal/lib/hcrypto/rsa.c ../heimdal/lib/hcrypto/rsa-ltm.c ../heimdal/lib/hcrypto/rsa-imath.c ../heimdal/lib/hcrypto/rc2.c ../heimdal/lib/hcrypto/rc4.c ../heimdal/lib/hcrypto/rijndael-alg-fst.c ../heimdal/lib/hcrypto/rnd_keys.c ../heimdal/lib/hcrypto/sha.c ../heimdal/lib/hcrypto/sha256.c ../heimdal/lib/hcrypto/sha512.c ../heimdal/lib/hcrypto/ui.c ../heimdal/lib/hcrypto/evp.c ../heimdal/lib/hcrypto/evp-hcrypto.c ../heimdal/lib/hcrypto/pkcs5.c ../heimdal/lib/hcrypto/pkcs12.c ../heimdal/lib/hcrypto/rand.c ../heimdal/lib/hcrypto/rand-egd.c ../heimdal/lib/hcrypto/rand-unix.c ../heimdal/lib/hcrypto/rand-fortuna.c ../heimdal/lib/hcrypto/rand-timer.c ../heimdal/lib/hcrypto/hmac.c ../heimdal/lib/hcrypto/camellia.c ../heimdal/lib/hcrypto/camellia-ntt.c ../heimdal/lib/hcrypto/common.c ../heimdal/lib/hcrypto/validate.c',
+    includes='../heimdal/lib/hcrypto ../heimdal/lib',
+    deps='HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1 HEIMDAL_HCRYPTO_LTM'
+    )
 
 
-bld.SAMBA_LIBRARY('HEIMDAL_HX509',
-	'../heimdal/lib/hx509/ca.c ../heimdal/lib/hx509/cert.c ../heimdal/lib/hx509/cms.c ../heimdal/lib/hx509/collector.c ../heimdal/lib/hx509/crypto.c ../heimdal/lib/hx509/error.c ../heimdal/lib/hx509/env.c ../heimdal/lib/hx509/file.c ../heimdal/lib/hx509/keyset.c ../heimdal/lib/hx509/ks_dir.c ../heimdal/lib/hx509/ks_file.c ../heimdal/lib/hx509/ks_keychain.c ../heimdal/lib/hx509/ks_mem.c ../heimdal/lib/hx509/ks_null.c ../heimdal/lib/hx509/ks_p11.c ../heimdal/lib/hx509/ks_p12.c ../heimdal/lib/hx509/lock.c ../heimdal/lib/hx509/name.c ../heimdal/lib/hx509/peer.c ../heimdal/lib/hx509/print.c ../heimdal/lib/hx509/req.c ../heimdal/lib/hx509/revoke.c ../heimdal/lib/hx509/sel.c ../heimdal/lib/hx509/hx509_err.c ../heimdal/lib/hx509/sel-lex.c ../heimdal/lib/hx509/sel-gram.c',
-	includes='../heimdal/lib/hx509',
-	deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 HEIMDAL_WIND',
-	is_bundled=True,
-	)
+bld.HEIMDAL_LIBRARY('HEIMDAL_HX509',
+    '../heimdal/lib/hx509/ca.c ../heimdal/lib/hx509/cert.c ../heimdal/lib/hx509/cms.c ../heimdal/lib/hx509/collector.c ../heimdal/lib/hx509/crypto.c ../heimdal/lib/hx509/error.c ../heimdal/lib/hx509/env.c ../heimdal/lib/hx509/file.c ../heimdal/lib/hx509/keyset.c ../heimdal/lib/hx509/ks_dir.c ../heimdal/lib/hx509/ks_file.c ../heimdal/lib/hx509/ks_keychain.c ../heimdal/lib/hx509/ks_mem.c ../heimdal/lib/hx509/ks_null.c ../heimdal/lib/hx509/ks_p11.c ../heimdal/lib/hx509/ks_p12.c ../heimdal/lib/hx509/lock.c ../heimdal/lib/hx509/name.c ../heimdal/lib/hx509/peer.c ../heimdal/lib/hx509/print.c ../heimdal/lib/hx509/req.c ../heimdal/lib/hx509/revoke.c ../heimdal/lib/hx509/sel.c ../heimdal/lib/hx509/hx509_err.c ../heimdal/lib/hx509/sel-lex.c ../heimdal/lib/hx509/sel-gram.c',
+    includes='../heimdal/lib/hx509',
+    deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 HEIMDAL_WIND',
+    )
 
 
-bld.SAMBA_LIBRARY('HEIMDAL_WIND',
-	'../heimdal/lib/wind/wind_err.c ../heimdal/lib/wind/stringprep.c ../heimdal/lib/wind/errorlist.c ../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/normalize.c ../heimdal/lib/wind/normalize_table.c ../heimdal/lib/wind/combining.c ../heimdal/lib/wind/combining_table.c ../heimdal/lib/wind/utf8.c ../heimdal/lib/wind/bidi.c ../heimdal/lib/wind/bidi_table.c ../heimdal/lib/wind/ldap.c ../heimdal/lib/wind/map.c ../heimdal/lib/wind/map_table.c',
-	includes='../heimdal/lib/wind',
-	deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR',
-	is_bundled=True,
-	)
+bld.HEIMDAL_LIBRARY('HEIMDAL_WIND',
+    '../heimdal/lib/wind/wind_err.c ../heimdal/lib/wind/stringprep.c ../heimdal/lib/wind/errorlist.c ../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/normalize.c ../heimdal/lib/wind/normalize_table.c ../heimdal/lib/wind/combining.c ../heimdal/lib/wind/combining_table.c ../heimdal/lib/wind/utf8.c ../heimdal/lib/wind/bidi.c ../heimdal/lib/wind/bidi_table.c ../heimdal/lib/wind/ldap.c ../heimdal/lib/wind/map.c ../heimdal/lib/wind/map_table.c',
+    includes='../heimdal/lib/wind',
+    deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR',
+    )
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_HOSTCC',
-	HEIMDAL_ROKEN_HOSTCC_SOURCE,
-	use_hostcc=True,
-	use_global_deps=False,
-	includes='../heimdal/lib/roken',
-	cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
-	group='compiler_libraries',
-	deps='LIBREPLACE_HOSTCC',
-	)
+    HEIMDAL_ROKEN_HOSTCC_SOURCE,
+    use_hostcc=True,
+    use_global_deps=False,
+    includes='../heimdal/lib/roken',
+    cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+    group='compiler_libraries',
+    deps='LIBREPLACE_HOSTCC',
+    )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_COM_ERR',
-	'../heimdal/lib/com_err/com_err.c ../heimdal/lib/com_err/error.c',
-	includes='../heimdal/lib/com_err',
-	deps='HEIMDAL_ROKEN',
+    '../heimdal/lib/com_err/com_err.c ../heimdal/lib/com_err/error.c',
+    includes='../heimdal/lib/com_err',
+    deps='HEIMDAL_ROKEN',
         enabled=not bld.CONFIG_SET('HAVE_COM_ERR')
-	)
+    )
 
 
 # here is the asn1 compiler build rule
 bld.SAMBA_BINARY('asn1_compile',
-	'../heimdal/lib/asn1/main.c ../heimdal/lib/asn1/gen.c ../heimdal/lib/asn1/gen_copy.c ../heimdal/lib/asn1/gen_decode.c ../heimdal/lib/asn1/gen_encode.c ../heimdal/lib/asn1/gen_free.c ../heimdal/lib/asn1/gen_glue.c ../heimdal/lib/asn1/gen_length.c ../heimdal/lib/asn1/gen_seq.c ../heimdal/lib/asn1/gen_template.c ../heimdal/lib/asn1/hash.c ../heimdal/lib/asn1/symbol.c ../heimdal/lib/asn1/asn1parse.c ../heimdal/lib/asn1/lex.c ../heimdal/lib/vers/print_version.c',
-	use_hostcc=True,
+    '../heimdal/lib/asn1/main.c ../heimdal/lib/asn1/gen.c ../heimdal/lib/asn1/gen_copy.c ../heimdal/lib/asn1/gen_decode.c ../heimdal/lib/asn1/gen_encode.c ../heimdal/lib/asn1/gen_free.c ../heimdal/lib/asn1/gen_glue.c ../heimdal/lib/asn1/gen_length.c ../heimdal/lib/asn1/gen_seq.c ../heimdal/lib/asn1/gen_template.c ../heimdal/lib/asn1/hash.c ../heimdal/lib/asn1/symbol.c ../heimdal/lib/asn1/asn1parse.c ../heimdal/lib/asn1/lex.c ../heimdal/lib/vers/print_version.c',
+    use_hostcc=True,
         use_global_deps=False,
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         includes='../heimdal/lib/asn1 ../heimdal/lib/roken',
         group='build_compilers',
-	deps='HEIMDAL_ROKEN_HOSTCC LIBREPLACE_HOSTCC',
+    deps='HEIMDAL_ROKEN_HOSTCC LIBREPLACE_HOSTCC',
         install=False
-	)
+    )
 
 
 bld.SAMBA_BINARY('compile_et',
-	'../heimdal/lib/vers/print_version.c ../heimdal/lib/com_err/parse.c ../heimdal/lib/com_err/lex.c ../heimdal/lib/com_err/compile_et.c',
-	use_hostcc=True,
+    '../heimdal/lib/vers/print_version.c ../heimdal/lib/com_err/parse.c ../heimdal/lib/com_err/lex.c ../heimdal/lib/com_err/compile_et.c',
+    use_hostcc=True,
         use_global_deps=False,
-	includes='../heimdal/lib/com_err',
+    includes='../heimdal/lib/com_err',
         group='build_compilers',
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
-	deps='HEIMDAL_ROKEN_HOSTCC LIBREPLACE_HOSTCC',
+    deps='HEIMDAL_ROKEN_HOSTCC LIBREPLACE_HOSTCC',
         install=False
-	)
+    )
 
 
 bld.SAMBA_BINARY('samba4kinit',
-	'../heimdal/kuser/kinit.c ../heimdal/lib/vers/print_version.c',
+    '../heimdal/kuser/kinit.c ../heimdal/lib/vers/print_version.c',
         includes='../heimdal/lib/roken',
-	deps='HEIMDAL_KRB5 HEIMDAL_NTLM',
+    deps='HEIMDAL_KRB5 HEIMDAL_NTLM',
         install=False
-	)
+    )
 
 
 bld.SAMBA_BINARY('samba4kpasswd',
-	'../heimdal/kpasswd/kpasswd.c ../heimdal/lib/vers/print_version.c',
+    '../heimdal/kpasswd/kpasswd.c ../heimdal/lib/vers/print_version.c',
         includes='../heimdal/lib/roken',
-	deps='HEIMDAL_KRB5 HEIMDAL_NTLM',
+    deps='HEIMDAL_KRB5 HEIMDAL_NTLM',
         install=False
-	)
+    )
 
 
 bld.SAMBA_BINARY('rkpty',
-	'../heimdal/lib/roken/rkpty.c',
-	deps='HEIMDAL_ROKEN OPENPTY',
+    '../heimdal/lib/roken/rkpty.c',
+    deps='HEIMDAL_ROKEN OPENPTY',
         cflags='-DPACKAGE="Samba"',
         install=False
-	)
+    )
 
 HEIMDAL_GSSAPI_SPNEGO_SOURCE = '''
-	../heimdal/lib/gssapi/spnego/init_sec_context.c
-	../heimdal/lib/gssapi/spnego/external.c
-	../heimdal/lib/gssapi/spnego/compat.c
-	../heimdal/lib/gssapi/spnego/context_stubs.c
-	../heimdal/lib/gssapi/spnego/cred_stubs.c
-	../heimdal/lib/gssapi/spnego/accept_sec_context.c
+    ../heimdal/lib/gssapi/spnego/init_sec_context.c
+    ../heimdal/lib/gssapi/spnego/external.c
+    ../heimdal/lib/gssapi/spnego/compat.c
+    ../heimdal/lib/gssapi/spnego/context_stubs.c
+    ../heimdal/lib/gssapi/spnego/cred_stubs.c
+    ../heimdal/lib/gssapi/spnego/accept_sec_context.c
 '''
 
 bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/spnego/spnego-private.h',
@@ -491,54 +503,54 @@ bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/spnego/spnego-private.h',
 
 
 HEIMDAL_GSSAPI_KRB5_SOURCE = '''
-	../heimdal/lib/gssapi/krb5/copy_ccache.c
-	../heimdal/lib/gssapi/krb5/delete_sec_context.c
-	../heimdal/lib/gssapi/krb5/init_sec_context.c
-	../heimdal/lib/gssapi/krb5/context_time.c
-	../heimdal/lib/gssapi/krb5/init.c
-	../heimdal/lib/gssapi/krb5/address_to_krb5addr.c
-	../heimdal/lib/gssapi/krb5/get_mic.c
-	../heimdal/lib/gssapi/krb5/inquire_context.c
-	../heimdal/lib/gssapi/krb5/add_cred.c
-	../heimdal/lib/gssapi/krb5/inquire_cred.c
-	../heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c
-	../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
-	../heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c
-	../heimdal/lib/gssapi/krb5/inquire_names_for_mech.c
-	../heimdal/lib/gssapi/krb5/indicate_mechs.c
-	../heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
-	../heimdal/lib/gssapi/krb5/export_sec_context.c
-	../heimdal/lib/gssapi/krb5/import_sec_context.c
-	../heimdal/lib/gssapi/krb5/duplicate_name.c
-	../heimdal/lib/gssapi/krb5/import_name.c
-	../heimdal/lib/gssapi/krb5/compare_name.c
-	../heimdal/lib/gssapi/krb5/export_name.c
-	../heimdal/lib/gssapi/krb5/canonicalize_name.c
-	../heimdal/lib/gssapi/krb5/unwrap.c
-	../heimdal/lib/gssapi/krb5/wrap.c
-	../heimdal/lib/gssapi/krb5/release_name.c
-	../heimdal/lib/gssapi/krb5/cfx.c
-	../heimdal/lib/gssapi/krb5/8003.c
-	../heimdal/lib/gssapi/krb5/arcfour.c
-	../heimdal/lib/gssapi/krb5/encapsulate.c
-	../heimdal/lib/gssapi/krb5/display_name.c
-	../heimdal/lib/gssapi/krb5/sequence.c
-	../heimdal/lib/gssapi/krb5/display_status.c
-	../heimdal/lib/gssapi/krb5/release_buffer.c
-	../heimdal/lib/gssapi/krb5/external.c
-	../heimdal/lib/gssapi/krb5/compat.c
-	../heimdal/lib/gssapi/krb5/creds.c
-	../heimdal/lib/gssapi/krb5/acquire_cred.c
-	../heimdal/lib/gssapi/krb5/release_cred.c
-	../heimdal/lib/gssapi/krb5/store_cred.c
-	../heimdal/lib/gssapi/krb5/set_cred_option.c
-	../heimdal/lib/gssapi/krb5/decapsulate.c
-	../heimdal/lib/gssapi/krb5/verify_mic.c
-	../heimdal/lib/gssapi/krb5/accept_sec_context.c
-	../heimdal/lib/gssapi/krb5/set_sec_context_option.c
-	../heimdal/lib/gssapi/krb5/process_context_token.c
-	../heimdal/lib/gssapi/krb5/prf.c
-	../heimdal/lib/gssapi/krb5/aeap.c
+    ../heimdal/lib/gssapi/krb5/copy_ccache.c
+    ../heimdal/lib/gssapi/krb5/delete_sec_context.c
+    ../heimdal/lib/gssapi/krb5/init_sec_context.c
+    ../heimdal/lib/gssapi/krb5/context_time.c
+    ../heimdal/lib/gssapi/krb5/init.c
+    ../heimdal/lib/gssapi/krb5/address_to_krb5addr.c
+    ../heimdal/lib/gssapi/krb5/get_mic.c
+    ../heimdal/lib/gssapi/krb5/inquire_context.c
+    ../heimdal/lib/gssapi/krb5/add_cred.c
+    ../heimdal/lib/gssapi/krb5/inquire_cred.c
+    ../heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c
+    ../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
+    ../heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c
+    ../heimdal/lib/gssapi/krb5/inquire_names_for_mech.c
+    ../heimdal/lib/gssapi/krb5/indicate_mechs.c
+    ../heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
+    ../heimdal/lib/gssapi/krb5/export_sec_context.c
+    ../heimdal/lib/gssapi/krb5/import_sec_context.c
+    ../heimdal/lib/gssapi/krb5/duplicate_name.c
+    ../heimdal/lib/gssapi/krb5/import_name.c
+    ../heimdal/lib/gssapi/krb5/compare_name.c
+    ../heimdal/lib/gssapi/krb5/export_name.c
+    ../heimdal/lib/gssapi/krb5/canonicalize_name.c
+    ../heimdal/lib/gssapi/krb5/unwrap.c
+    ../heimdal/lib/gssapi/krb5/wrap.c
+    ../heimdal/lib/gssapi/krb5/release_name.c
+    ../heimdal/lib/gssapi/krb5/cfx.c
+    ../heimdal/lib/gssapi/krb5/8003.c
+    ../heimdal/lib/gssapi/krb5/arcfour.c
+    ../heimdal/lib/gssapi/krb5/encapsulate.c
+    ../heimdal/lib/gssapi/krb5/display_name.c
+    ../heimdal/lib/gssapi/krb5/sequence.c
+    ../heimdal/lib/gssapi/krb5/display_status.c
+    ../heimdal/lib/gssapi/krb5/release_buffer.c
+    ../heimdal/lib/gssapi/krb5/external.c
+    ../heimdal/lib/gssapi/krb5/compat.c
+    ../heimdal/lib/gssapi/krb5/creds.c
+    ../heimdal/lib/gssapi/krb5/acquire_cred.c
+    ../heimdal/lib/gssapi/krb5/release_cred.c
+    ../heimdal/lib/gssapi/krb5/store_cred.c
+    ../heimdal/lib/gssapi/krb5/set_cred_option.c
+    ../heimdal/lib/gssapi/krb5/decapsulate.c
+    ../heimdal/lib/gssapi/krb5/verify_mic.c
+    ../heimdal/lib/gssapi/krb5/accept_sec_context.c
+    ../heimdal/lib/gssapi/krb5/set_sec_context_option.c
+    ../heimdal/lib/gssapi/krb5/process_context_token.c
+    ../heimdal/lib/gssapi/krb5/prf.c
+    ../heimdal/lib/gssapi/krb5/aeap.c
 '''
 
 bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/krb5/gsskrb5-private.h',
@@ -546,30 +558,30 @@ bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/krb5/gsskrb5-private.h',
 
 
 HEIMDAL_HX509_OBJH_SOURCE = '''
-	../heimdal/lib/hx509/ca.c
-	../heimdal/lib/hx509/cert.c
-	../heimdal/lib/hx509/cms.c
-	../heimdal/lib/hx509/collector.c
-	../heimdal/lib/hx509/crypto.c
-	../heimdal/lib/hx509/error.c
-	../heimdal/lib/hx509/env.c
-	../heimdal/lib/hx509/file.c
-	../heimdal/lib/hx509/keyset.c
-	../heimdal/lib/hx509/ks_dir.c
-	../heimdal/lib/hx509/ks_file.c
-	../heimdal/lib/hx509/ks_keychain.c
-	../heimdal/lib/hx509/ks_mem.c
-	../heimdal/lib/hx509/ks_null.c
-	../heimdal/lib/hx509/ks_p11.c
-	../heimdal/lib/hx509/ks_p12.c
-	../heimdal/lib/hx509/lock.c
-	../heimdal/lib/hx509/name.c
-	../heimdal/lib/hx509/peer.c
-	../heimdal/lib/hx509/print.c
-	../heimdal/lib/hx509/req.c
-	../heimdal/lib/hx509/revoke.c
-	../heimdal/lib/hx509/sel.c
-	../heimdal/lib/hx509/hx509_err.c
+    ../heimdal/lib/hx509/ca.c
+    ../heimdal/lib/hx509/cert.c
+    ../heimdal/lib/hx509/cms.c
+    ../heimdal/lib/hx509/collector.c
+    ../heimdal/lib/hx509/crypto.c
+    ../heimdal/lib/hx509/error.c
+    ../heimdal/lib/hx509/env.c
+    ../heimdal/lib/hx509/file.c
+    ../heimdal/lib/hx509/keyset.c
+    ../heimdal/lib/hx509/ks_dir.c
+    ../heimdal/lib/hx509/ks_file.c
+    ../heimdal/lib/hx509/ks_keychain.c
+    ../heimdal/lib/hx509/ks_mem.c
+    ../heimdal/lib/hx509/ks_null.c
+    ../heimdal/lib/hx509/ks_p11.c
+    ../heimdal/lib/hx509/ks_p12.c
+    ../heimdal/lib/hx509/lock.c
+    ../heimdal/lib/hx509/name.c
+    ../heimdal/lib/hx509/peer.c
+    ../heimdal/lib/hx509/print.c
+    ../heimdal/lib/hx509/req.c
+    ../heimdal/lib/hx509/revoke.c
+    ../heimdal/lib/hx509/sel.c
+    ../heimdal/lib/hx509/hx509_err.c
 '''
 
 bld.HEIMDAL_AUTOPROTO('../heimdal/lib/hx509/hx509-protos.h',
@@ -581,13 +593,13 @@ bld.HEIMDAL_AUTOPROTO('../heimdal/lib/hx509/hx509-private.h',
                       options="-q -P comment -p")
 
 HEIMDAL_HEIM_ASN1_DER_SOURCE = '''
-	../heimdal/lib/asn1/der_get.c
-	../heimdal/lib/asn1/der_put.c
-	../heimdal/lib/asn1/der_free.c
-	../heimdal/lib/asn1/der_format.c
-	../heimdal/lib/asn1/der_length.c
-	../heimdal/lib/asn1/der_copy.c
-	../heimdal/lib/asn1/der_cmp.c
+    ../heimdal/lib/asn1/der_get.c
+    ../heimdal/lib/asn1/der_put.c
+    ../heimdal/lib/asn1/der_free.c
+    ../heimdal/lib/asn1/der_format.c
+    ../heimdal/lib/asn1/der_length.c
+    ../heimdal/lib/asn1/der_copy.c
+    ../heimdal/lib/asn1/der_cmp.c
 '''
 
 bld.HEIMDAL_AUTOPROTO('../heimdal/lib/asn1/der-protos.h',