From b9f486cd022dc67e5118dfdca38052c7b13c10fa Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Apr 2005 13:56:48 +0200 Subject: Add missing parts for the "Cybozu" custom build, to avoid future manual patches. configure.in: Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets. However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'. In order to do custom builds without manual patches, this value gets special handling in 'configure'. Also, when it is given, the CPP symbol enabling the additional code is set. mysys/charset-def.c: Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function. strings/ctype-utf8.c: Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function. --- configure.in | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 03b0ed9be29..c4bd95b9a24 100644 --- a/configure.in +++ b/configure.in @@ -2770,16 +2770,23 @@ case $default_charset in ;; utf8) default_charset_default_collation="utf8_general_ci" - 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_persian_ci 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" + if test "$default_collation" = "utf8_general_cs"; then + # For those who explicitly desire "utf8_general_cs", support it, + # and then also set the CPP switch enabling that code. + UTFC="utf8_general_cs" + AC_DEFINE([HAVE_UTF8_GENERAL_CS], [1], [certain Japanese customer]) + else + 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_persian_ci 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" + fi default_charset_collations="$UTFC" ;; *) -- cgit v1.2.1