diff options
| author | Alexander Bokovoy <ab@samba.org> | 2003-08-15 20:09:12 +0000 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2003-08-15 20:09:12 +0000 |
| commit | 836b9fffa0eadc818019ba36ed764e97d4f9a801 (patch) | |
| tree | 9a18ad198f50f0a3e485fcdeef0d2a9789175392 /source/aclocal.m4 | |
| parent | 836746beabda583f7d86bb7e6faa855f172a888d (diff) | |
| download | samba-836b9fffa0eadc818019ba36ed764e97d4f9a801.tar.gz samba-836b9fffa0eadc818019ba36ed764e97d4f9a801.tar.xz samba-836b9fffa0eadc818019ba36ed764e97d4f9a801.zip | |
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
Diffstat (limited to 'source/aclocal.m4')
| -rw-r--r-- | source/aclocal.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
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) |