diff options
| author | Richard Sharpe <sharpe@samba.org> | 2003-08-13 23:08:53 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2003-08-13 23:08:53 +0000 |
| commit | 609ffe06d956a02b4ffbbb0d1158096f84a66e4e (patch) | |
| tree | 64d01da44ae39404648a67691bf6391a0293e309 /source3 | |
| parent | 7a56a78964cb148f632cc1dcfcf4c9feecc4ed17 (diff) | |
| download | samba-609ffe06d956a02b4ffbbb0d1158096f84a66e4e.tar.gz samba-609ffe06d956a02b4ffbbb0d1158096f84a66e4e.tar.bz2 samba-609ffe06d956a02b4ffbbb0d1158096f84a66e4e.zip | |
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)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 7 |
1 files changed, 5 insertions, 2 deletions
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; + } } } } |