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)

diff --git a/source3/configure.in b/source3/configure.in
index 16efcdec1784a1029879c0e48bfa761ba175969d..ea8ad753187bc202ed3cbacb500cdae916dfe27a 100644 (file)
--- 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;
+            }
           }
        }
     }