diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-09 23:51:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-10 14:18:06 +0200 |
| commit | fc6bb5d47a985d0215c2a8ea9a00c21abf131ad9 (patch) | |
| tree | da89f2d6208c0241b2e70dad23a6fc847aa1eed5 /lib/util/charset/wscript_build | |
| parent | 258ffddf1cc1ac6b1ff5a07585940ca552170807 (diff) | |
| download | samba-fc6bb5d47a985d0215c2a8ea9a00c21abf131ad9.tar.gz samba-fc6bb5d47a985d0215c2a8ea9a00c21abf131ad9.tar.bz2 samba-fc6bb5d47a985d0215c2a8ea9a00c21abf131ad9.zip | |
lib/util/charset: add back loading of charset modules
For autoconf builds these remain as modules, for waf builds they are
built into the charset library.
This is required to provide the CP850 charset when iconv is not available.
The charset modules static for the waf builds because with proper
shared libs, there isn't the same need for these to be in seperate .so
files. The modules are also not produced if a system iconv is found,
except for developers, to allow testing of both code paths.
Andrew Bartlett
Diffstat (limited to 'lib/util/charset/wscript_build')
| -rw-r--r-- | lib/util/charset/wscript_build | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build index 7a9918046d..d659c7a450 100644 --- a/lib/util/charset/wscript_build +++ b/lib/util/charset/wscript_build @@ -10,35 +10,39 @@ bld.SAMBA_SUBSYSTEM('charset', 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='', + init_function='charset_weird_init', deps='samba-util', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_weird'), + internal_module=True, enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_weird')) bld.SAMBA_MODULE('charset_CP850', subsystem='charset', source='CP850.c', - init_function='', + init_function='charset_CP850_init', deps='samba-util', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_CP850'), + internal_module=True, enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_CP850')) bld.SAMBA_MODULE('charset_CP437', subsystem='charset', source='CP437.c', - init_function='', + init_function='charset_CP437_init', deps='samba-util', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_CP437'), + internal_module=True, enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_CP437')) bld.SAMBA_MODULE('charset_macosxfs', subsystem='charset', source='charset_macosxfs.c', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_macosxfs'), + init_function='charset_macosxfs_init', + internal_module=True, enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_macosxfs')) |