summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-17 14:12:36 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:47 +1100
commitfd000928e3ccbb5a3eb447f4644e290dc5dae016 (patch)
treea84179f5bf3303dca32b7073de2a3685a3a338ca
parentba942c8bfeff87b11af0ffb1e55dc77d4d5c64f0 (diff)
downloadsamba-fd000928e3ccbb5a3eb447f4644e290dc5dae016.tar.gz
samba-fd000928e3ccbb5a3eb447f4644e290dc5dae016.tar.bz2
samba-fd000928e3ccbb5a3eb447f4644e290dc5dae016.zip
charset: allow s3 waf build to use lib/util/charset
the only conflict is with 'CHARSET' itself, which now builds conditionally on _SAMBA_BUILD_==4 Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--lib/util/charset/wscript_build11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index ba8b869a37..4137bf6cee 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -1,11 +1,12 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('CHARSET',
- source='iconv.c charcnv.c util_unistr.c',
- public_deps='iconv CODEPOINTS',
- public_headers='charset.h',
- )
+if bld.env._SAMBA_BUILD_ == 4:
+ bld.SAMBA_SUBSYSTEM('CHARSET',
+ source='iconv.c charcnv.c util_unistr.c',
+ public_deps='iconv CODEPOINTS',
+ public_headers='charset.h',
+ )
bld.SAMBA_SUBSYSTEM('CODEPOINTS',
source='codepoints.c',