diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-19 19:13:21 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-20 06:27:06 +0200 |
| commit | f9acf770e9c121aa495cb7e19175a4a6e45ff3d9 (patch) | |
| tree | b64283a8a0f929f28de73f84ef207f5f5018f8f9 /lib/util/charset/wscript_build | |
| parent | 8316577b7538f7204c5fd6328756c4c3f171b36e (diff) | |
| download | samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.gz samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.bz2 samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.zip | |
lib/util/charset: remove charset module loading
Now that the 'table' modules are gone, there is no reason for there to
be charset modules at all. This builds the macosxfs and weird modules
into the binary at the appropriate times, and changes the tests to
test instead the difference between the remaining internal handlers
and iconv().
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Sep 20 06:27:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/util/charset/wscript_build')
| -rw-r--r-- | lib/util/charset/wscript_build | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build index 390a1448fb..621fed6c0e 100644 --- a/lib/util/charset/wscript_build +++ b/lib/util/charset/wscript_build @@ -6,27 +6,6 @@ bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER', bld.SAMBA_SUBSYSTEM('charset', public_headers='charset.h', - source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c', + source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c weird.c charset_macosxfs.c', deps='DYNCONFIG ICONV_WRAPPER', public_deps='talloc') - -# In the WAF builds, all charset modules are linked in at compile -# time, as we have shared libs. Using run-time loading as well will -# cause dependency loops - -bld.SAMBA_MODULE('charset_weird', - subsystem='charset', - source='weird.c', - init_function='charset_weird_init', - deps='samba-util', - internal_module=True, - enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_weird')) - -bld.SAMBA_MODULE('charset_macosxfs', - subsystem='charset', - source='charset_macosxfs.c', - init_function='charset_macosxfs_init', - internal_module=True, - enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_macosxfs')) - - |