From 609ffe06d956a02b4ffbbb0d1158096f84a66e4e Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Wed, 13 Aug 2003 23:08:53 +0000 Subject: Test for CP850 and reorder the tests, looking for ASCII, then CP850, then IBM850 and lastly ISO-8859-1. (This used to be commit df8ff3f6b54aca4e43459d4275c88b90508c961a) --- source3/configure.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/configure.in b/source3/configure.in index 16efcdec17..ea8ad75318 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1569,11 +1569,14 @@ dnl there might be a working iconv further down the list of LOOK_DIRS main(){ iconv_t cd = iconv_open("ASCII", "UCS-2LE"); if (cd == 0 || cd == (iconv_t)-1) { - cd = iconv_open("ISO-8859-1", "UCS-2LE"); + cd = iconv_open("CP850", "UCS-2LE"); if (cd == 0 || cd == (iconv_t)-1) { cd = iconv_open("IBM850", "UCS-2LE"); /* Solaris has this */ if (cd == 0 || cd == (iconv_t)-1) { - return -1; + cd = iconv_open("ISO-8859-1", "UCS-2LE"); /* Solaris has this */ + if (cd == 0 || cd == (iconv_t)-1) { + return -1; + } } } } -- cgit