[uim-commit] r212 - in trunk: . scm uim

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-09 23:00:47 -0800 (Sun, 09 Jan 2005)
New Revision: 212

Modified:
   trunk/configure.ac
   trunk/scm/Makefile.am
   trunk/uim/Makefile.am
   trunk/uim/context.h
   trunk/uim/uim.c
Log:
* configure.ac
  - Add new option --enable-compat-table
  - Add configure result message for developers
  - Set default enable_* vars even if not specified by configure
    option
* scm/Makefile.am
  - (SCM_FILES): Enclose hk.scm into if COMPAT_TABLE
* uim/Makefile.am
  - (libuim_la_SOURCES): Enclose uim-table.c into if COMPAT_TABLE
* uim/context.h
  - (uim_init_table_subrs): Enclose into #ifdef UIM_COMPAT_TABLE
* uim/uim.c
  - (uim_init_scm): Enclose uim_init_table_subrs() into #ifdef
    UIM_COMPAT_TABLE


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-01-10 05:59:47 UTC (rev 211)
+++ trunk/configure.ac	2005-01-10 07:00:47 UTC (rev 212)
@@ -234,9 +234,14 @@
   ],
   [ PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0, use_applet="yes",use_applet="no") ])
 
+
 AC_ARG_ENABLE(debug,
   AC_HELP_STRING([--enable-debug],
-                 [enable debugging]))
+                 [enable debugging]),
+  [],
+  [
+    enable_debug="no"
+  ])
 
 AC_ARG_ENABLE(compat-scm,
   AC_HELP_STRING([--disable-compat-scm],
@@ -250,10 +255,23 @@
     enable_compat_scm="yes"
   ])
 
+AC_ARG_ENABLE(compat-table,
+  AC_HELP_STRING([--enable-compat-table],
+                 [enable obsolete table API for hk.scm (broken)]),
+  [],
+  [
+    enable_compat_table="no"
+  ])
+
 AC_ARG_ENABLE(compat-custom,
   AC_HELP_STRING([--enable-compat-custom],
-                 [enable obsolete version of 'custom API' required by sumika. This exclusively disables new custom API]))
+                 [enable obsolete version of 'custom API' required by sumika. This exclusively disables new custom API]),
+  [],
+  [
+    enable_compat_custom="no"
+  ])
 
+
 AC_ARG_ENABLE(scm-nested-eval,
   AC_HELP_STRING([--disable-scm-nested-eval],
                  [disable nested Scheme evaluation from C (i.e. C -> Scheme -> C -> Scheme) (for developer, will be obsolete)]),
@@ -268,7 +286,11 @@
 
 AC_ARG_ENABLE(callback-queue,
   AC_HELP_STRING([--enable-callback-queue],
-                 [enable callback queue (for developer, will be obsolete)]))
+                 [enable callback queue (for developer, will be obsolete)]),
+  [],
+  [
+    enable_callback_queue="no"
+  ])
 
 AC_ARG_ENABLE(fep,
   AC_HELP_STRING([--disable-fep],
@@ -337,6 +359,7 @@
 AM_CONDITIONAL(DICT, test x$use_dict = xyes)
 AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
 AM_CONDITIONAL(COMPAT_SCM, test x$enable_compat_scm = xyes)
+AM_CONDITIONAL(COMPAT_TABLE, test x$enable_compat_table = xyes)
 AM_CONDITIONAL(COMPAT_CUSTOM, test x$enable_compat_custom = xyes)
 AM_CONDITIONAL(SCM_NESTED_EVAL, test x$enable_scm_nested_eval = xyes)
 AM_CONDITIONAL(CALLBACK_QUEUE, test x$enable_callback_queue = xyes)
@@ -372,6 +395,11 @@
             [Enable obsolete part of uim-scm API])
 fi
 
+if test x$enable_compat_table = xyes; then
+  AC_DEFINE(UIM_COMPAT_TABLE, 1,
+            [Enable obsolete table API for hk.scm (broken)])
+fi
+
 if test x$enable_compat_custom = xyes; then
   AC_DEFINE(UIM_COMPAT_CUSTOM, 1,
             [Enable obsolete version of 'custom API' required by sumika])
@@ -449,3 +477,16 @@
    SUMIKA       : ${use_sumika}
    DICT         : ${use_dict}
 ])
+
+if test x$enable_debug = xyes; then
+AC_MSG_RESULT([
+Configure Result for developers:
+
+   DEBUG           : ${enable_debug}
+   COMPAT_SCM      : ${enable_compat_scm}
+   COMPAT_TABLE    : ${enable_compat_table}
+   COMPAT_CUSTOM   : ${enable_compat_custom}
+   SCM_NESTED_EVAL : ${enable_scm_nested_eval}
+   CALLBACK_QUEUE  : ${enable_callback_queue}
+])
+fi

Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am	2005-01-10 05:59:47 UTC (rev 211)
+++ trunk/scm/Makefile.am	2005-01-10 07:00:47 UTC (rev 212)
@@ -19,9 +19,12 @@
  tutcode.scm\
  spellcheck.scm\
  latin.scm \
- hk.scm \
  zaurus.scm \
  romaja.scm pyunihan.scm pyload.scm m17nlib.scm \
  uim-sh.scm custom.scm custom-vars.scm \
  pinyin-big5.scm \
  plugin.scm
+
+if COMPAT_TABLE
+SCM_FILES += hk.scm
+endif

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-01-10 05:59:47 UTC (rev 211)
+++ trunk/uim/Makefile.am	2005-01-10 07:00:47 UTC (rev 212)
@@ -17,11 +17,15 @@
 		skk-dic.c \
 		prime.c \
 		intl.c intl.h \
-		uim-ipc.c uim-table.c \
+		uim-ipc.c \
 		getpeereid.c \
 		setenv.c \
 		plugin.c
 
+if COMPAT_TABLE
+libuim_la_SOURCES += uim-table.c
+endif
+
 if COMPAT_SCM
   pkginclude_HEADERS += uim-compat-scm.h
   libuim_la_SOURCES += uim-compat-scm.c

Modified: trunk/uim/context.h
===================================================================
--- trunk/uim/context.h	2005-01-10 05:59:47 UTC (rev 211)
+++ trunk/uim/context.h	2005-01-10 07:00:47 UTC (rev 212)
@@ -277,7 +277,9 @@
 #endif
 void uim_init_key_subrs(void);
 void uim_init_util_subrs(void);
+#ifdef UIM_COMPAT_TABLE
 void uim_init_table_subrs(void);
+#endif
 void uim_init_im_subrs(void);
 
 /**/

Modified: trunk/uim/uim.c
===================================================================
--- trunk/uim/uim.c	2005-01-10 05:59:47 UTC (rev 211)
+++ trunk/uim/uim.c	2005-01-10 07:00:47 UTC (rev 212)
@@ -640,7 +640,9 @@
   uim_init_im_subrs();
   uim_init_util_subrs();
   uim_init_key_subrs();
+#ifdef UIM_COMPAT_TABLE
   uim_init_table_subrs();
+#endif
   uim_init_prime();
   uim_init_skk_dic();