diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/character_sets.m4 | 65 | ||||
| -rw-r--r-- | config/ac-macros/dtrace.m4 | 38 | ||||
| -rw-r--r-- | config/ac-macros/plugins.m4 | 6 |
3 files changed, 104 insertions, 5 deletions
diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4 index 24bdd92b083..81967d383ec 100644 --- a/config/ac-macros/character_sets.m4 +++ b/config/ac-macros/character_sets.m4 @@ -13,11 +13,11 @@ define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257) define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjpms 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) +define(CHARSETS_AVAILABLE5,sjis swe7 tis620 ucs2 ujis utf8mb4 utf8 utf16 utf32) DEFAULT_CHARSET=latin1 CHARSETS_AVAILABLE="CHARSETS_AVAILABLE0 CHARSETS_AVAILABLE1 CHARSETS_AVAILABLE2 CHARSETS_AVAILABLE3 CHARSETS_AVAILABLE4 CHARSETS_AVAILABLE5" -CHARSETS_COMPLEX="big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8" +CHARSETS_COMPLEX="big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8mb4 utf8 utf16 utf32" AC_DIVERT_POP @@ -50,7 +50,7 @@ AC_ARG_WITH(extra-charsets, AC_MSG_CHECKING("character sets") -CHARSETS="$default_charset latin1 utf8" +CHARSETS="$default_charset latin1 utf8mb4 utf8" if test "$extra_charsets" = no; then CHARSETS="$CHARSETS" @@ -195,8 +195,23 @@ do AC_DEFINE([USE_MB], [1], [Use multi-byte character routines]) AC_DEFINE(USE_MB_IDENT, 1) ;; + utf8mb4) + AC_DEFINE(HAVE_CHARSET_utf8mb4, 1, [Define to enable utf8mb4]) + AC_DEFINE([USE_MB], 1, [Use multi-byte character routines]) + AC_DEFINE(USE_MB_IDENT, 1) + ;; utf8) - AC_DEFINE(HAVE_CHARSET_utf8, 1, [Define to enable ut8]) + AC_DEFINE(HAVE_CHARSET_utf8, 1, [Define to enable utf8]) + AC_DEFINE([USE_MB], 1, [Use multi-byte character routines]) + AC_DEFINE(USE_MB_IDENT, 1) + ;; + utf16) + AC_DEFINE(HAVE_CHARSET_utf16, 1, [Define to enable utf16]) + AC_DEFINE([USE_MB], 1, [Use multi-byte character routines]) + AC_DEFINE(USE_MB_IDENT, 1) + ;; + utf32) + AC_DEFINE(HAVE_CHARSET_utf32, 1, [Define to enable utf32]) AC_DEFINE([USE_MB], 1, [Use multi-byte character routines]) AC_DEFINE(USE_MB_IDENT, 1) ;; @@ -381,6 +396,48 @@ case $default_charset in fi default_charset_collations="$UTFC" ;; + utf8mb4) + default_charset_default_collation="utf8mb4_general_ci" + define(UTFC1, utf8mb4_general_ci utf8mb4_bin) + define(UTFC2, utf8mb4_czech_ci utf8mb4_danish_ci) + define(UTFC3, utf8mb4_esperanto_ci utf8mb4_estonian_ci utf8mb4_hungarian_ci) + define(UTFC4, utf8mb4_icelandic_ci utf8mb4_latvian_ci utf8mb4_lithuanian_ci) + define(UTFC5, utf8mb4_persian_ci utf8mb4_polish_ci utf8mb4_romanian_ci) + define(UTFC6, utf8mb4_sinhala_ci utf8mb4_slovak_ci utf8mb4_slovenian_ci) + define(UTFC7, utf8mb4_spanish2_ci utf8mb4_spanish_ci) + define(UTFC8, utf8mb4_swedish_ci utf8mb4_turkish_ci) + define(UTFC9, utf8mb4_unicode_ci) + UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9" + default_charset_collations="$UTFC" + ;; + utf16) + default_charset_default_collation="utf16_general_ci" + define(UTFC1, utf16_general_ci utf16_bin) + define(UTFC2, utf16_czech_ci utf16_danish_ci) + define(UTFC3, utf16_esperanto_ci utf16_estonian_ci utf16_hungarian_ci) + define(UTFC4, utf16_icelandic_ci utf16_latvian_ci utf16_lithuanian_ci) + define(UTFC5, utf16_persian_ci utf16_polish_ci utf16_romanian_ci) + define(UTFC6, utf16_sinhala_ci utf16_slovak_ci utf16_slovenian_ci) + define(UTFC7, utf16_spanish2_ci utf16_spanish_ci) + define(UTFC8, utf16_swedish_ci utf16_turkish_ci) + define(UTFC9, utf16_unicode_ci) + UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9" + default_charset_collations="$UTFC" + ;; + utf32) + default_charset_default_collation="utf32_general_ci" + define(UTFC1, utf32_general_ci utf32_bin) + define(UTFC2, utf32_czech_ci utf32_danish_ci) + define(UTFC3, utf32_esperanto_ci utf32_estonian_ci utf32_hungarian_ci) + define(UTFC4, utf32_icelandic_ci utf32_latvian_ci utf32_lithuanian_ci) + define(UTFC5, utf32_persian_ci utf32_polish_ci utf32_romanian_ci) + define(UTFC6, utf32_sinhala_ci utf32_slovak_ci utf32_slovenian_ci) + define(UTFC7, utf32_spanish2_ci utf32_spanish_ci) + define(UTFC8, utf32_swedish_ci utf32_turkish_ci) + define(UTFC9, utf32_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). See the Installation chapter in the Reference Manual.]) diff --git a/config/ac-macros/dtrace.m4 b/config/ac-macros/dtrace.m4 new file mode 100644 index 00000000000..a42d78d97fe --- /dev/null +++ b/config/ac-macros/dtrace.m4 @@ -0,0 +1,38 @@ +dnl --------------------------------------------------------------------------- +dnl Macro: DTRACE_TEST +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(dtrace, + AC_HELP_STRING([--enable-dtrace],[Build with support for the DTRACE.]), + [ + ENABLE_DTRACE="$enable_dtrace" + ], + [ + ENABLE_DTRACE="yes" + ] +) +DTRACEFLAGS="" +HAVE_DTRACE="" +HAVE_DTRACE_DASH_G="" +if test "$ENABLE_DTRACE" = "yes"; then + AC_PATH_PROGS(DTRACE, dtrace, [not found], [$PATH:/usr/sbin]) + if test "$DTRACE" = "not found"; then + ENABLE_DTRACE="no" + else + AC_DEFINE([HAVE_DTRACE], [1], [Defined to 1 if DTrace support is enabled]) + case "$target_os" in + *solaris*) + HAVE_DTRACE_DASH_G="yes" + ;; + *) + HAVE_DTRACE_DASH_G="no" + ;; + esac + fi +fi +AC_SUBST(DTRACEFLAGS) +AC_SUBST(HAVE_DTRACE) +AM_CONDITIONAL([HAVE_DTRACE], [ test "$ENABLE_DTRACE" = "yes" ]) +AM_CONDITIONAL([HAVE_DTRACE_DASH_G], [ test "$HAVE_DTRACE_DASH_G" = "yes" ]) +dnl --------------------------------------------------------------------------- +dnl End Macro: DTRACE_TEST +dnl --------------------------------------------------------------------------- diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 5d15afeda99..9fcfc031281 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -460,7 +460,11 @@ dnl Although this is "pretty", it breaks libmysqld build ]) ]) ]) - mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]" + m4_ifdef([$9],[ + mysql_mandatory_plugins="$mysql_mandatory_plugins [builtin_]$2[_plugin]," + ],[ + mysql_optional_plugins="$mysql_optional_plugins [builtin_]$2[_plugin]," + ]) [with_plugin_]$2=yes AC_MSG_RESULT([yes]) m4_ifdef([$11],[ |