summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-01-01 01:54:35 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-01-01 04:00:03 +0100
commit4ea992428bbfea18b261ce28417228be730ffbc8 (patch)
treedceefdb9b16c63dbf1a7875f41345e8620bfb525 /source4
parent3febaed9ba9e02ba43259023c4e8255e53c0ad85 (diff)
downloadsamba-4ea992428bbfea18b261ce28417228be730ffbc8.tar.gz
samba-4ea992428bbfea18b261ce28417228be730ffbc8.tar.bz2
samba-4ea992428bbfea18b261ce28417228be730ffbc8.zip
heimdal_build: Allow using system heimntlm.
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_build26
-rw-r--r--source4/heimdal_build/wscript_configure2
2 files changed, 16 insertions, 12 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index c71e22494b..217eb22747 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -493,18 +493,20 @@ HEIMDAL_LIBRARY('kdc', source=KDC_SOURCE,
HEIMDAL_AUTOPROTO('kdc/kdc-protos.h', KDC_SOURCE)
HEIMDAL_AUTOPROTO_PRIVATE('kdc/kdc-private.h', KDC_SOURCE)
-HEIMDAL_ERRTABLE('HEIMNTLM_ET',
- 'lib/ntlm/ntlm_err.et')
-
-HEIMNTLM_SOURCE = 'lib/ntlm/ntlm.c'
-HEIMDAL_LIBRARY('heimntlm',
- source=HEIMNTLM_SOURCE,
- includes='../heimdal/lib/ntlm',
- deps='roken hcrypto krb5',
- vnum='1.0.1',
- version_script='lib/ntlm/version-script.map',
- )
-HEIMDAL_AUTOPROTO('lib/ntlm/heimntlm-protos.h', HEIMNTLM_SOURCE)
+
+if not bld.CONFIG_SET("USING_SYSTEM_HEIMNTLM"):
+ HEIMDAL_ERRTABLE('HEIMNTLM_ET',
+ 'lib/ntlm/ntlm_err.et')
+
+ HEIMNTLM_SOURCE = 'lib/ntlm/ntlm.c'
+ HEIMDAL_LIBRARY('heimntlm',
+ source=HEIMNTLM_SOURCE,
+ includes='../heimdal/lib/ntlm',
+ deps='roken hcrypto krb5',
+ vnum='1.0.1',
+ version_script='lib/ntlm/version-script.map',
+ )
+ HEIMDAL_AUTOPROTO('lib/ntlm/heimntlm-protos.h', HEIMNTLM_SOURCE)
HEIMDAL_SUBSYSTEM('HEIMDAL_HDB_KEYS',
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 63be7b701c..5090df9d8e 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -104,6 +104,8 @@ check_system_heimdal_lib("asn1", "initialize_asn1_error_table", "asn1_err.h", on
check_system_heimdal_lib("heimbase", "heim_cmp", "heimbase.h", onlyif="roken")
check_system_heimdal_lib("hcrypto", "MD4_Init", "hcrypto/md4.h",
onlyif="asn1 roken com_err")
+check_system_heimdal_lib("heimntlm", "heim_ntlm_ntlmv2_key", "heimntlm.h",
+ onlyif="roken hcrypto krb5")
# With the proper checks in place we should be able to build against the system libtommath.
# conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h')