--- ./src/scim_m17n_imengine.cpp~	2006-12-01 17:45:12.000000000 +0900
+++ ./src/scim_m17n_imengine.cpp	2010-10-07 11:43:33.000000000 +0900
@@ -28,6 +28,7 @@
 #define Uses_SCIM_LOOKUP_TABLE
 #define Uses_SCIM_CONFIG_BASE
 #define Uses_STL_MAP
+#define Uses_C_STRING
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
@@ -205,7 +206,7 @@
 WideString
 M17NFactory::get_help () const
 {
-#if M17N_VERSION >= 10300
+#if M17NLIB_MAJOR_VERSION > 1 || (M17NLIB_MAJOR_VERSION == 1 && M17NLIB_MINOR_VERSION >=3) /*M17N_VERSION >= 10300*/
     MText *desc = minput_get_description (msymbol (m_lang.c_str ()), msymbol (m_name.c_str ()));
     if (desc) {
         int bufsize = mtext_len (desc) * 6;  // long enough
@@ -230,7 +231,7 @@
 String
 M17NFactory::get_icon_file () const
 {
-#if M17N_VERSION >= 10300
+#if M17NLIB_MAJOR_VERSION > 1 || (M17NLIB_MAJOR_VERSION == 1 && M17NLIB_MINOR_VERSION >=3) /*M17N_VERSION >= 10300*/
     MPlist *l = minput_get_title_icon (msymbol (m_lang.c_str ()), msymbol (m_name.c_str ()));
     if (l) {
         char buf [256] = SCIM_M17N_ICON_FILE;
@@ -434,7 +435,7 @@
 
     register_properties (props);
 
-#if M17N_VERSION >= 10300
+#if M17NLIB_MAJOR_VERSION > 1 || (M17NLIB_MAJOR_VERSION == 1 && M17NLIB_MINOR_VERSION >=3) /*M17N_VERSION >= 10300*/
     m17n_process_key (Minput_focus_in);
 #else
     preedit_draw_cb (m_ic, Minput_preedit_draw);
@@ -450,7 +451,7 @@
 {
     SCIM_DEBUG_IMENGINE(2) << "focus_out.\n";
 
-#if M17N_VERSION >= 10300
+#if M17NLIB_MAJOR_VERSION > 1 || (M17NLIB_MAJOR_VERSION == 1 && M17NLIB_MINOR_VERSION >=3) /*M17N_VERSION >= 10300*/
     m17n_process_key (Minput_focus_out);
 #else
     reset ();
@@ -497,7 +498,7 @@
     mplist_put(callback_list, Minput_candidates_draw,  (void*)candidates_draw_cb);
     mplist_put(callback_list, Minput_candidates_done,  (void*)candidates_done_cb);
 
-#if M17N_VERSION >= 10300
+#if M17NLIB_MAJOR_VERSION > 1 || (M17NLIB_MAJOR_VERSION == 1 && M17NLIB_MINOR_VERSION >=3) /*M17N_VERSION >= 10300*/
     mplist_put(callback_list, Minput_get_surrounding_text,  (void*)get_surrounding_text_cb);
     mplist_put(callback_list, Minput_delete_surrounding_text,  (void*)delete_surrounding_text_cb);
 #endif
@@ -753,7 +754,7 @@
     }
 }
 
-#if M17N_VERSION >= 10300
+#if M17NLIB_MAJOR_VERSION > 1 || (M17NLIB_MAJOR_VERSION == 1 && M17NLIB_MINOR_VERSION >=3) /*M17N_VERSION >= 10300*/
 void
 M17NInstance::get_surrounding_text_cb (MInputContext *ic, MSymbol command)
 {