From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 17 Feb 2011 03:12:36 +0000 (+1100)
Subject: charset: allow s3 waf build to use lib/util/charset
X-Git-Tag: tevent-0.9.11~523
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd000928e3ccbb5a3eb447f4644e290dc5dae016;p=thirdparty%2Fsamba.git

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>
---

diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index ba8b869a375..4137bf6cee0 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',