diff options
| author | Matthieu Patou <mat@matws.net> | 2010-12-09 00:17:37 +0300 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2010-12-08 23:19:19 +0100 |
| commit | c4e795c6bfc2d168ec5934786a4bd521a9fe12a1 (patch) | |
| tree | b75e5b2f7c269522a6d38030b5f1d4a5e77b71bb | |
| parent | 461d100a355038b6925e8b061e4d848fc380dd52 (diff) | |
| download | samba-c4e795c6bfc2d168ec5934786a4bd521a9fe12a1.tar.gz samba-c4e795c6bfc2d168ec5934786a4bd521a9fe12a1.tar.bz2 samba-c4e795c6bfc2d168ec5934786a4bd521a9fe12a1.zip | |
build: Cope with broken libiconv
library iconv needs mbrtowc but some system didn't provide it (ie.
HP-UX 11.0)
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Wed Dec 8 23:19:19 CET 2010 on sn-devel-104
| -rw-r--r-- | lib/util/charset/wscript_configure | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index e54bfcc924..346d585f5c 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -12,4 +12,8 @@ conf.CHECK_LIB(libs="iconv", shlib=True) if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h') or conf.CHECK_FUNCS('iconv_open', headers='iconv.h')): - conf.DEFINE('HAVE_NATIVE_ICONV', 1) + if conf.env['HAVE_LIBICONV']: + if conf.CHECK_FUNCS('mbrtowc', headers='wchar.h'): + conf.DEFINE('HAVE_NATIVE_ICONV', 1) + else: + conf.DEFINE('HAVE_NATIVE_ICONV', 1) |