diff options
| -rw-r--r-- | buildtools/wafsamba/samba_conftests.py | 11 | ||||
| -rw-r--r-- | source3/build/charset.py | 6 |
2 files changed, 7 insertions, 10 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) diff --git a/source3/build/charset.py b/source3/build/charset.py index fce1f4af31..d1940c3ef1 100644 --- a/source3/build/charset.py +++ b/source3/build/charset.py @@ -13,19 +13,19 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): # check for default dos charset name for charset in ['CP850', 'IBM850']: - if conf.CHECK_CHARSET_EXISTS(charset): + if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): default_dos_charset=charset break # check for default display charset name for charset in ['ASCII', '646']: - if conf.CHECK_CHARSET_EXISTS(charset): + if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): default_display_charset=charset break # check for default unix charset name for charset in ['UTF-8', 'UTF8']: - if conf.CHECK_CHARSET_EXISTS(charset): + if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): default_unix_charset=charset break |