[PATCH] build: fallback for external heimdal tools

Gustavo Zacarias gustavo at zacarias.com.ar
Mon Jan 20 10:09:46 MST 2014


Provide a fallback for asn1_compile and compile_et binaries.
If they're not cross-built within samba just assume they are in PATH.

Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
---
 source4/heimdal_build/wscript_build     | 4 ++++
 source4/heimdal_build/wscript_configure | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index ae7fbec..7274970 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -925,6 +925,8 @@ if not bld.CONFIG_SET('USING_SYSTEM_ASN1_COMPILE'):
         install=False
     )
     bld.env['ASN1_COMPILE'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'asn1_compile')
+else:
+    bld.env['ASN1_COMPILE'] = 'asn1_compile'
 
 
 if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
@@ -939,6 +941,8 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
         install=False
         )
     bld.env['COMPILE_ET'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'compile_et')
+else:
+    bld.env['COMPILE_ET'] = 'compile_et'
 
 HEIMDAL_BINARY('samba4kinit',
     'kuser/kinit.c',
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index bed63d6..6e8bdbc 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -162,6 +162,8 @@ conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1)
 conf.define('HAVE_KRB5_PRINCIPAL_GET_NUM_COMP', 1)
 conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1)
 conf.define('HAVE_FLAGS_IN_KRB5_CREDS', 1)
+conf.define('USING_SYSTEM_ASN1_COMPILE', 1)
+conf.define('USING_SYSTEM_COMPILE_ET', 1)
 
 heimdal_includedirs = []
 heimdal_libdirs = []
-- 
1.8.3.2



More information about the samba-technical mailing list