diff options
| author | unknown <tim@localhost.polyesthetic.msg> | 2000-09-04 14:30:54 -0400 |
|---|---|---|
| committer | unknown <tim@localhost.polyesthetic.msg> | 2000-09-04 14:30:54 -0400 |
| commit | d6ae95147b45ee5c902aa93b881088933ceb205d (patch) | |
| tree | ff386e5f0381c7a4e4e486e7706628478c1d3b2d /configure.in | |
| parent | 4fa1d1cb3c31595da3071b4780514296ab63b756 (diff) | |
| parent | 568f7100923ee245f8117cca655d042e64218137 (diff) | |
| download | mariadb-git-d6ae95147b45ee5c902aa93b881088933ceb205d.tar.gz | |
Merge changes
Docs/manual.texi:
- merge changes
configure.in:
- merge changes
sql/share/charsets/Index:
- merge changes
sql/share/charsets/win1251.conf:
- merge changes
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 6ee9d249a3f..d5260435f91 100644 --- a/configure.in +++ b/configure.in @@ -1524,7 +1524,8 @@ AC_ARG_WITH(charset, [ --with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr - latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr +dnl win1251 is deprecated - it's available, but not listed here in the help + latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620; default is latin1)], [default_charset="$withval"], [default_charset="$DEFAULT_CHARSET"]) |