From 836b9fffa0eadc818019ba36ed764e97d4f9a801 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 15 Aug 2003 20:09:12 +0000 Subject: Fix charset detection code in configure. Now we are: 1. Try to find correct name for default character sets for the platform 2. Use DEFAULT_{DOS|DISPLAY|UNIX}_CHARSET defines set during configure phase as defaults This should fix CP850 problem on Solaris (at least) because it actually has IBM850 which is the same but under different name --- source/aclocal.m4 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'source/aclocal.m4') diff --git a/source/aclocal.m4 b/source/aclocal.m4 index 88f055f9ba0..a6aa1bb1de3 100644 --- a/source/aclocal.m4 +++ b/source/aclocal.m4 @@ -610,10 +610,9 @@ AC_DEFUN(jm_ICONV, fi ]) -AC_DEFUN(rjs_CHARSET -[ +AC_DEFUN(rjs_CHARSET,[ dnl Find out if we can convert from $1 to UCS2-LE - AC_MSG_CHECKING(we can convert from $1 to UCS2-LE) + AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?]) AC_TRY_RUN([ #include <$jm_cv_include> main(){ @@ -623,10 +622,8 @@ main(){ } return 0; } - ],ICONV_CHARSET=$1,ICONV_CHARSET="",]) - if test x"$ICONV_CHARSET" != x; then - AC_MSG_RESULT($ICONV_CHARSET) - fi + ],ICONV_CHARSET=$1,ICONV_CHARSET=no,ICONV_CHARSET=cross) + AC_MSG_RESULT($ICONV_CHARSET) ]) dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR) -- cgit