From fd000928e3ccbb5a3eb447f4644e290dc5dae016 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 17 Feb 2011 14:12:36 +1100 Subject: 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 --- lib/util/charset/wscript_build | 11 ++++++----- 1 file 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', -- cgit