Compile all charset conversion tables if --with-extra-charsets=all

or --with-extra-charsets=complex is given.

3 files changed, 8 insertions, 0 deletions

diff --git a/acconfig.h b/acconfig.h
index 825842d256a..71dea4825f6 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -281,6 +281,9 @@
 /* READLINE: */
 #undef VOID_SIGHANDLER
 
+/* Define this if you want extra character set conversion table*/
+#undef DEFINE_ALL_CHARACTER_SETS
+
 
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
diff --git a/configure.in b/configure.in
index 2adf2208332..7853b615ae0 100644
--- a/configure.in
+++ b/configure.in
@@ -2262,9 +2262,11 @@ elif test "$extra_charsets" = complex; then
   CHARSETS=`/bin/ls -1 $srcdir/strings/ctype-*.c | \
                   sed -e 's;^.*/ctype-;;' -e 's;.c$;;'`
   CHARSETS=`echo $CHARSETS`     # get rid of line breaks
+  AC_DEFINE([DEFINE_ALL_CHARACTER_SETS])
 else
   if test "$extra_charsets" = all; then
     CHARSETS="$CHARSETS_AVAILABLE $CHARSETS_DEPRECATED"
+    AC_DEFINE([DEFINE_ALL_CHARACTER_SETS])
   else
     CHARSETS=`echo $extra_charsets | sed -e 's/,/ /g'`
   fi
diff --git a/sql/convert.cc b/sql/convert.cc
index e4ae13d1e07..f84c80a6121 100644
--- a/sql/convert.cc
+++ b/sql/convert.cc
@@ -20,6 +20,9 @@
 ** Some of the tables are hidden behind IFDEF to reduce some space.
 ** One can enable them by removing the // characters from the next comment
 ** One must also give a name to each mapping that one wants to use...
+**
+** All tables are activated if --with-extra-charsets=all or
+** --with-extra-charsets=complex was given to configure.
 */
 
 /* #define DEFINE_ALL_CHARACTER_SETS */