From c4e795c6bfc2d168ec5934786a4bd521a9fe12a1 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Thu, 9 Dec 2010 00:17:37 +0300 Subject: [PATCH] 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 Autobuild-Date: Wed Dec 8 23:19:19 CET 2010 on sn-devel-104 --- lib/util/charset/wscript_configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index e54bfcc9249..346d585f5c4 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) -- 2.34.1