Configure.in/Makefile.in charset related things are now earier to maintain

Fixes in charset related C++ code


configure.in:
  Make things to be easier managable
include/m_ctype.h:
  Hide some functions under conditional compilation
libmysql/Makefile.shared:
  Make things to be easier managable
sql/item_func.cc:
  Fixed that private member is not available in this context
sql/item_strfunc.cc:
  Fixed that private member is not available in this context
strings/Makefile.am:
  Make charset things to be easier managable
  Some fixes in charset C++ code
strings/ctype-big5.c:
  Hide some functions under conditional compilation
strings/ctype-czech.c:
  Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
  Hide some functions under conditional compilation
strings/ctype-gb2312.c:
  Hide some functions under conditional compilation
strings/ctype-gbk.c:
  Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
  Hide some functions under conditional compilation
strings/ctype-mb.c:
  Hide some functions under conditional compilation
strings/ctype-sjis.c:
  Hide some functions under conditional compilation
strings/ctype-tis620.c:
  Hide some functions under conditional compilation
strings/ctype-ujis.c:
  Hide some functions under conditional compilation

11 files changed, 50 insertions, 6 deletions

diff --git a/strings/Makefile.am b/strings/Makefile.am
index 33d048a42d1..15baa8316e5 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -22,23 +22,23 @@ pkglib_LIBRARIES =	libmystrings.a
 # Exact one of ASSEMBLER_X
 if ASSEMBLER_x86
 ASRCS		= strings-x86.s longlong2str-x86.s
-CSRCS		= bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c ctype-simple.c ctype-mb.c strnlen.c
+CSRCS		= bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c
 else
 if ASSEMBLER_sparc
 # These file MUST all be on the same line!! Otherwise automake
 # generats a very broken makefile
 ASRCS		= bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
-CSRCS		= strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c ctype-simple.c ctype-mb.c strnlen.c
+CSRCS		= strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c
 else
 #no assembler
 ASRCS		=
 # These file MUST all be on the same line!! Otherwise automake
 # generats a very broken makefile
-CSRCS		= strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c ctype-simple.c ctype-mb.c strnlen.c
+CSRCS		= strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c
 endif
 endif
 
-libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS)
+libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
 noinst_PROGRAMS = conf_to_src
 # Default charset definitions
 EXTRA_DIST =		ctype-big5.c ctype-czech.c ctype-euc_kr.c \
@@ -61,7 +61,7 @@ OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
 			sleep.h specific.h version.h pwd.h timers.h uio.h \
 			cdefs.h machdep.h signal.h __signal.h util.h
 
-libmystrings_a_LIBADD=	@CHARSET_OBJS@
+libmystrings_a_LIBADD=
 conf_to_src_SOURCES = conf_to_src.c
 conf_to_src_LDADD=
 #force static linking of conf_to_src - essential when linking against
@@ -69,7 +69,7 @@ conf_to_src_LDADD=
 conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
 
 # This is because the dependency tracking misses @FOO@ vars in sources.
-strtoull.o:		@CHARSET_OBJS@
+#strtoull.o:		@CHARSET_OBJS@
 
 
 if ASSEMBLER
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 2155f3e72c9..a8bda0131f7 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -31,6 +31,8 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_big5
+
 /* Support for Chinese(BIG5) characters, by jou@nematic.ieo.nctu.edu.tw
    modified by Wei He (hewei@mail.ied.ac.cn) */
 
@@ -390,3 +392,5 @@ int mbcharlen_big5(uint c)
 {
   return (isbig5head(c)? 2: 0);
 }
+
+#endif
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 7db37c0b5d9..eaf0b1ef38b 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -77,6 +77,8 @@
 
 #endif
 
+#ifdef HAVE_CHARSET_czech
+
 /*
 	These are four tables for four passes of the algorithm. Please see
 	below for what are the "special values"
@@ -513,3 +515,5 @@ uchar NEAR sort_order_czech[] = {
 };
 
 #endif
+
+#endif
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index ed8266bf96f..07cea62414b 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -30,6 +30,9 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_euc_kr
+
+
 uchar NEAR ctype_euc_kr[257] =
 {
     0,				/* For standard library */
@@ -196,3 +199,5 @@ int mbcharlen_euc_kr(uint c)
 {
   return (iseuc_kr(c) ? 2 : 0);
 }
+
+#endif
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 7b9b22f0227..3139bd81d52 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -28,6 +28,8 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_gb2312
+
 uchar NEAR ctype_gb2312[257] =
 {
   0,				/* For standard library */
@@ -178,3 +180,5 @@ int mbcharlen_gb2312(uint c)
 {
   return (isgb2312head(c)? 2:0);
 }
+
+#endif
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 3ef37d2f6bb..9a7154f566b 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -31,6 +31,9 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_gbk
+
+
 /* Support for Chinese(GBK) characters, by hewei@mail.ied.ac.cn */
 
 #define isgbkhead(c) (0x81<=(uchar)(c) && (uchar)(c)<=0xfe)
@@ -2715,3 +2718,5 @@ int mbcharlen_gbk(uint c)
 {
   return (isgbkhead(c)? 2:0);
 }
+
+#endif
diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c
index 961112a65b4..e7bbf1438a6 100644
--- a/strings/ctype-latin1_de.c
+++ b/strings/ctype-latin1_de.c
@@ -36,6 +36,8 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_latin1_de
+
 uchar ctype_latin1_de[] = {
     0,
    32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32,
@@ -350,3 +352,5 @@ my_bool my_like_range_latin1_de(CHARSET_INFO *cs,
     *min_str++ = *max_str++ = ' ';		// Because if key compression
   return 0;
 }
+
+#endif
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 97de219429c..d328ebb7a36 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -17,6 +17,9 @@
 #include <my_global.h>
 #include "m_ctype.h"
 
+#ifdef USE_MB
+
+
 void my_caseup_str_mb(CHARSET_INFO * cs, char *str)
 {
   register uint32 l;
@@ -123,3 +126,4 @@ int my_strncasecmp_mb(CHARSET_INFO * cs,
   return 0;
 }
 
+#endif
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index f3c5d8a2920..79d4e8a94c7 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -21,6 +21,9 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_sjis
+
+
 /*
  * This comment is parsed by configure to create ctype.c,
  * so don't change it unless you know what you are doing.
@@ -308,3 +311,5 @@ my_bool my_like_range_sjis(CHARSET_INFO *cs,
     *min_str++ = *max_str++ = ' ';	/* Because if key compression */
   return 0;
 }
+
+#endif
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 134ab527ecc..5df8b1d8cc6 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -49,6 +49,8 @@
 #include "m_ctype.h"
 #include "t_ctype.h"
 
+#ifdef HAVE_CHARSET_tis620
+
 static uchar* thai2sortable(const uchar *tstr,uint len);
 
 #define BUFFER_MULTIPLY 4
@@ -682,3 +684,5 @@ void ThNormalize(uchar* ptr, uint field_length, const uchar* from, uint length)
     }
   }
 }
+
+#endif
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 568b5a69d9d..80c09eedcff 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -28,6 +28,9 @@
 #include "m_string.h"
 #include "m_ctype.h"
 
+#ifdef HAVE_CHARSET_ujis
+
+
 uchar NEAR ctype_ujis[257] =
 {
     0,				/* For standard library */
@@ -198,3 +201,5 @@ int mbcharlen_ujis(uint c)
 {
   return (isujis(c)? 2: isujis_ss2(c)? 2: isujis_ss3(c)? 3: 0);
 }
+
+#endif