From 4971bde1da1aeef9f582a0fecc4c37831dde4e83 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Wed, 4 Dec 2013 22:50:11 +0100 Subject: [PATCH] waf: improve iconv checks there are broken iconv implementations around (e.g. on AIX) that you can compile against but that refuse any mapping requests make sure we do the same as the autoconf-based build did and fall back to our own code Bug: https://bugzilla.samba.org/show_bug.cgi?id=10308 Signed-off-by: Christian Ambach Reviewed-by: Andrew Bartlett (cherry picked from commit 15b2d1a658b3fc428c20a7a461168f464951f40f) (cherry picked from commit f5cbfd6ce5e5a0977e5c1a53046ee883b3431246) --- source3/build/charset.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source3/build/charset.py b/source3/build/charset.py index 44852a6..0033557 100644 --- a/source3/build/charset.py +++ b/source3/build/charset.py @@ -33,6 +33,12 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): default_unix_charset="UTF-8" # TODO: this used to warn about the set charset on cross builds + if default_dos_charset is False or default_unix_charset is False: + # we found iconv, but it failed to convert anything (e.g. on AIX) + conf.undefine('HAVE_NATIVE_ICONV'); + default_dos_charset = "ASCII" + default_unix_charset = "UTF-8" + conf.DEFINE('DEFAULT_DOS_CHARSET', default_dos_charset, quote=True) conf.DEFINE('DEFAULT_UNIX_CHARSET', default_unix_charset, quote=True) -- 1.8.3.2