configure.in:

  New collations were added.

configure.in

@@ -2337,7 +2337,7 @@ dnl you must also create strings/ctype-$charset_name.c
 AC_DIVERT_PUSH(0)
 
 define(CHARSETS_AVAILABLE1,ascii armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257)
-define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 dec8 euckr gb2312 gbk)
+define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 dec8 euckr gb2312 gbk geostd8)
 define(CHARSETS_AVAILABLE3,greek hebrew hp8 keybcs2 koi8r koi8u)
 define(CHARSETS_AVAILABLE4,latin1 latin2 latin5 latin7 macce macroman)
 define(CHARSETS_AVAILABLE5,sjis swe7 tis620 ucs2 ujis utf8)
@@ -2444,6 +2444,9 @@ do
       AC_DEFINE(USE_MB)
       AC_DEFINE(USE_MB_IDENT)
       ;;
+    geostd8)
+      AC_DEFINE(HAVE_CHARSET_geostd8)
+      ;;
     greek)
       AC_DEFINE(HAVE_CHARSET_greek)
       ;;
@@ -2572,6 +2575,10 @@ case $default_charset in
       default_charset_default_collation="gbk_chinese_ci"
       default_charset_collations="gbk_chinese_ci gbk_bin"
       ;;
+    geostd8)
+      default_charset_default_collation="geostd8_general_ci"
+      default_charset_collations="geostd8_general_ci geostd8_bin"
+      ;;
     greek)
       default_charset_default_collation="greek_general_ci"
       default_charset_collations="greek_general_ci greek_bin"
@@ -2634,7 +2641,17 @@ case $default_charset in
       ;;
     ucs2)
       default_charset_default_collation="ucs2_general_ci"
-      default_charset_collations="ucs2_general_ci ucs2_bin"
+      define(UCSC1, ucs2_general_ci ucs2_bin)
+      define(UCSC2, ucs2_czech_ci ucs2_danish_ci)
+      define(UCSC3, ucs2_estonian_ci ucs2_icelandic_ci)
+      define(UCSC4, ucs2_latvian_ci ucs2_lithuanian_ci)
+      define(UCSC5, ucs2_polish_ci ucs2_romanian_ci)
+      define(UCSC6, ucs2_slovak_ci ucs2_slovenian_ci)
+      define(UCSC7, ucs2_spanish2_ci ucs2_spanish_ci)
+      define(UCSC8, ucs2_swedish_ci ucs2_turkish_ci)
+      define(UCSC9, ucs2_unicode_ci)
+      UCSC="UCSC1 UCSC2 UCSC3 UCSC4 UCSC5 UCSC6 UCSC7 UCSC8 UCSC9"
+      default_charset_collations="$UCSC"
       ;;
     ujis)
       default_charset_default_collation="ujis_japanese_ci"
@@ -2642,7 +2659,17 @@ case $default_charset in
       ;;
     utf8)
       default_charset_default_collation="utf8_general_ci"
-      default_charset_collations="utf8_general_ci utf8_bin"
+      define(UTFC1, utf8_general_ci utf8_bin)
+      define(UTFC2, utf8_czech_ci utf8_danish_ci)
+      define(UTFC3, utf8_estonian_ci utf8_icelandic_ci)
+      define(UTFC4, utf8_latvian_ci utf8_lithuanian_ci)
+      define(UTFC5, utf8_polish_ci utf8_romanian_ci)
+      define(UTFC6, utf8_slovak_ci utf8_slovenian_ci)
+      define(UTFC7, utf8_spanish2_ci utf8_spanish_ci)
+      define(UTFC8, utf8_swedish_ci utf8_turkish_ci)
+      define(UTFC9, utf8_unicode_ci)
+      UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9"
+      default_charset_collations="$UTFC"
       ;;
     *)
       AC_MSG_ERROR([Charset $cs not available. (Available are: $CHARSETS_AVAILABLE).