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 ba8b869a375856aaf97c61ad0edf96216796f0f8..4137bf6cee0258ec20ab1d78c941732da1bdd1d6 100644 (file)
--- 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',