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 | 7ddf760beabd61b180c10b6a5a45d472d432da93 (patch) | |
| tree | b17a234375322a6cea51204d191ec95ec942d292 /source3/aclocal.m4 | |
| parent | bb6fb2880b8f567871c590305447b682c0ce182c (diff) | |
| download | samba-7ddf760beabd61b180c10b6a5a45d472d432da93.tar.gz samba-7ddf760beabd61b180c10b6a5a45d472d432da93.tar.bz2 samba-7ddf760beabd61b180c10b6a5a45d472d432da93.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
(This used to be commit 836b9fffa0eadc818019ba36ed764e97d4f9a801)
Diffstat (limited to 'source3/aclocal.m4')
| -rw-r--r-- | source3/aclocal.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/aclocal.m4 b/source3/aclocal.m4 index 88f055f9ba..a6aa1bb1de 100644 --- a/source3/aclocal.m4 +++ b/source3/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) |