summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-26 00:55:25 -0600
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:08 +1000
commit6b3a72dd45a1d8ff2aa087764a361a5370f84672 (patch)
tree4086921555723a6f48749e602ff338562e8e6735 /buildtools
parent8b14d217c4a6912f85889f146cc3281ac4c7a0dc (diff)
downloadsamba-6b3a72dd45a1d8ff2aa087764a361a5370f84672.tar.gz
samba-6b3a72dd45a1d8ff2aa087764a361a5370f84672.tar.bz2
samba-6b3a72dd45a1d8ff2aa087764a361a5370f84672.zip
s3-waf: fixed tests for charsets
Pair-Programmed-With: Kai
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_conftests.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index 742959db84..ce86ce1221 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -44,7 +44,7 @@ def CHECK_C_PROTOTYPE(conf, function, prototype, define, headers=None):
@conf
-def CHECK_CHARSET_EXISTS(conf, charset, outcharset='UCS2-LE', libs=None, headers=None, define=None):
+def CHECK_CHARSET_EXISTS(conf, charset, outcharset='UCS-2LE', headers=None, define=None):
'''check that a named charset is able to be used with iconv_open() for conversion
to a target charset
'''
@@ -53,15 +53,12 @@ def CHECK_CHARSET_EXISTS(conf, charset, outcharset='UCS2-LE', libs=None, headers
define = 'HAVE_CHARSET_%s' % charset.upper().replace('-','_')
return conf.CHECK_CODE('''
iconv_t cd = iconv_open("%s", "%s");
- if (cd == 0 || cd == (iconv_t)-1) {
- return -1;
- }
- return 0;
- ''' % (charset, outcharset),
+ if (cd == 0 || cd == (iconv_t)-1) return -1;
+ ''' % (charset, outcharset),
define=define,
execute=True,
- libs=libs,
msg=msg,
+ lib='iconv',
headers=headers)