summaryrefslogtreecommitdiff
path: root/source3/wscript_build
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-09-26 21:25:16 +0200
committerGünther Deschner <gd@samba.org>2010-09-27 00:39:36 +0200
commita6025af503f72a68f7bf7811750aac4c1e1d9db3 (patch)
treeae1bb142ecfd94916466a342cbabd77bef51302c /source3/wscript_build
parentce568816963119ac8436742d1e89f67021b084dc (diff)
downloadsamba-a6025af503f72a68f7bf7811750aac4c1e1d9db3.tar.gz
samba-a6025af503f72a68f7bf7811750aac4c1e1d9db3.tar.bz2
samba-a6025af503f72a68f7bf7811750aac4c1e1d9db3.zip
s3-waf: convert CHARSET into a subsystem.
Guenther
Diffstat (limited to 'source3/wscript_build')
-rw-r--r--source3/wscript_build34
1 files changed, 34 insertions, 0 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 6aba79879b..805369e83a 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1151,6 +1151,7 @@ for prefix in bld.env.MODULE_PREFIXES:
if prefix == 'auth': continue
if prefix == 'pdb': continue
if prefix == 'idmap': continue
+ if prefix == 'charset': continue
static_key = "%s_STATIC" % prefix.upper()
shared_key = "%s_SHARED" % prefix.upper()
@@ -1385,6 +1386,39 @@ bld.SAMBA_MODULE('IDMAP_ADEX',
internal_module=True,
enabled=True)
+bld.SAMBA_SUBSYSTEM('CHARSET',
+ source='',
+ deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
+ vars=locals())
+
+bld.SAMBA_MODULE('CHARSET_WEIRD',
+ subsystem='CHARSET',
+ source=CHARSET_WEIRD_SRC,
+ init_function='',
+ internal_module=True,
+ enabled=True)
+
+bld.SAMBA_MODULE('CHARSET_CP850',
+ subsystem='CHARSET',
+ source=CHARSET_CP850_SRC,
+ init_function='',
+ internal_module=True,
+ enabled=True)
+
+bld.SAMBA_MODULE('CHARSET_CP437',
+ subsystem='CHARSET',
+ source=CHARSET_CP437_SRC,
+ init_function='',
+ internal_module=True,
+ enabled=True)
+
+bld.SAMBA_MODULE('CHARSET_MACOSXFS',
+ subsystem='CHARSET',
+ source=CHARSET_MACOSXFS_SRC,
+ init_function='',
+ internal_module=True,
+ enabled=False) #fixme
+
bld.SAMBA_SUBSYSTEM('AVAHI',
source=AVAHI_SRC,
deps='avahi-common avahi-client',