summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-21 11:16:43 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-22 02:51:09 +0100
commite3e1cd86e9cb027057edc9eb164b8b84051243af (patch)
tree43ae6bc0d8e0707265f4583f235192bac900f8e6 /source3
parentcf3225d6c3898bfd425aedc894a1ddd7a484fd2a (diff)
downloadsamba-e3e1cd86e9cb027057edc9eb164b8b84051243af.tar.gz
samba-e3e1cd86e9cb027057edc9eb164b8b84051243af.tar.bz2
samba-e3e1cd86e9cb027057edc9eb164b8b84051243af.zip
s3-waf: cope with both toplevel and source3 build
this fixes the remaining subsystem differences for the two builds Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript_build22
1 files changed, 18 insertions, 4 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 8c7f1fda87..557606f2b4 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1006,10 +1006,7 @@ bld.SAMBA3_SUBSYSTEM('samba-util3',
deps='talloc CHARSET3 LIBCRYPTO',
vars=locals())
-#FIXME
-bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
-
-bld.SAMBA3_SUBSYSTEM('ldb',
+bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c')
bld.SAMBA3_SUBSYSTEM('errors3',
@@ -1353,6 +1350,23 @@ if not bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3')
bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')
+ bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
+ bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
+else:
+
+ # dynconfig provides this in the toplevel build
+ bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
+ 'localedir.c',
+ cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
+
+ # point the s3 rules at in-tree heimdal
+ bld.SAMBA3_SUBSYSTEM('gssapi_krb5',
+ source='',
+ deps='gssapi krb5')
+ bld.SAMBA3_SUBSYSTEM('k5crypto',
+ source='',
+ deps='krb5')
+