summaryrefslogtreecommitdiff
path: root/lib/util/charset/wscript_build
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-03 12:29:12 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-03 07:37:07 +0200
commit80f1d49b61560f326fb55f2df09cc4f30e7a85ea (patch)
tree5bc73a35dd8e5dc2169cfb11fbec8c7f632d1932 /lib/util/charset/wscript_build
parent7c083caf741d4f12cdf630026e02d9f07a64d0fb (diff)
downloadsamba-80f1d49b61560f326fb55f2df09cc4f30e7a85ea.tar.gz
samba-80f1d49b61560f326fb55f2df09cc4f30e7a85ea.tar.bz2
samba-80f1d49b61560f326fb55f2df09cc4f30e7a85ea.zip
lib/util/charset Use push_string and talloc_strupper/strlower from common code
The only caller of push_string() (not to be confused with push_string_check()) in the common code was encode_pw_buffer(), and it didn't use the alignment or STR_UPPER flags. The talloc_strupper() and talloc_strlower() functions are tested in smbtorture, and are next_codepoint() based. Andrew Bartlett
Diffstat (limited to 'lib/util/charset/wscript_build')
-rw-r--r--lib/util/charset/wscript_build17
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index 771ff5dc24..7623131146 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -1,18 +1,11 @@
#!/usr/bin/env python
-
-if bld.env._SAMBA_BUILD_ == 4:
- bld.SAMBA_SUBSYSTEM('CHARSET',
- source='util_unistr.c',
- public_deps='CODEPOINTS',
- public_headers='charset.h',
- )
-
bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER',
source='iconv.c',
public_deps='iconv replace talloc')
-bld.SAMBA_SUBSYSTEM('CODEPOINTS',
- source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c',
- deps='DYNCONFIG 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',
+ deps='DYNCONFIG ICONV_WRAPPER'
+ )