Author: yamakenz
Date: Fri Jul 20 16:05:51 2007
New Revision: 4768
Modified:
trunk/configure.ac
trunk/uim/Makefile.am
trunk/uim/anthy-utf8.c
trunk/uim/anthy.c
trunk/uim/uim.c
Log:
* uim/anthy-utf8.c
- Exclude iconv.h and errno.h
- (iconv_cd_e2u, iconv_cd_u2e, create_context): Fix iconv_t to
abstract (void *)
- (eucjp_to_utf8, utf8_to_eucjp): Cosmetic change
- (uim_anthy_plugin_instance_init, uim_anthy_plugin_instance_quit):
Rename to uim_anthy_utf8_*()
- (uim_anthy_utf8_plugin_instance_init,
uim_anthy_utf8_plugin_instance_quit):
* Renamed from uim_anthy_*()
* Add lacked prototype decl
- Replace ENABLE_ANTHY_STATIC with ENABLE_ANTHY_UTF8_STATIC
* uim/anthy.c
- (uim_anthy_plugin_instance_init, uim_anthy_plugin_instance_quit):
Add lacked prototype decl
* uim/uim.c
- (uim_anthy_plugin_instance_init, uim_anthy_plugin_instance_quit):
Add lacked prototype decl
- (uim_anthy_utf8_plugin_instance_init,
uim_anthy_utf8_plugin_instance_quit): Add prototype
- (uim_init_internal, uim_quit): Add --enable-anthy-utf8-static support
* uim/Makefile.am
- Add --enable-anthy-utf8-static support
* configure.ac
- Add --enable-anthy-utf8-static
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Jul 20 16:05:51 2007
@@ -1250,6 +1250,24 @@
AM_CONDITIONAL(ENABLE_ANTHY_STATIC, test x$build_anthy_static = xyes)
+AC_ARG_ENABLE(anthy-utf8-static,
+ AC_HELP_STRING([--enable-anthy-utf8-static],
+ [@<:@default=no@:>@]),
+ [
+ case $enable_anthy_utf8_static in
+ yes)
+ build_anthy_utf8_static="yes"
+ ;;
+ no|*)
+ build_anthy_utf8_static="no"
+ ;;
+ esac
+ ], [
+ build_anthy_utf8_static="no"
+ ])
+
+AM_CONDITIONAL(ENABLE_ANTHY_UTF8_STATIC, test x$build_anthy_utf8_static = xyes)
+
#
# Compiler options
#
Modified: trunk/uim/Makefile.am
==============================================================================
--- trunk/uim/Makefile.am (original)
+++ trunk/uim/Makefile.am Fri Jul 20 16:05:51 2007
@@ -84,12 +84,16 @@
endif
if ANTHY_UTF8
+if ENABLE_ANTHY_UTF8_STATIC
+ libuim_la_SOURCES += anthy-utf8.c
+else
uim_plugin_LTLIBRARIES += libuim-anthy-utf8.la
libuim_anthy_utf8_la_SOURCES = anthy-utf8.c
libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim.la
libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@
endif
+endif
if MANA
uim_plugin_LTLIBRARIES += libuim-mana.la
@@ -144,6 +148,10 @@
if ENABLE_ANTHY_STATIC
libuim_la_LIBADD += @ANTHY_LIBS@
libuim_la_CPPFLAGS += -DENABLE_ANTHY_STATIC
+endif
+if ENABLE_ANTHY_UTF8_STATIC
+ libuim_la_LIBADD += @ANTHY_LIBS@
+ libuim_la_CPPFLAGS += -DENABLE_ANTHY_UTF8_STATIC
endif
if DEBUG
Modified: trunk/uim/anthy-utf8.c
==============================================================================
--- trunk/uim/anthy-utf8.c (original)
+++ trunk/uim/anthy-utf8.c Fri Jul 20 16:05:51 2007
@@ -35,8 +35,6 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <iconv.h>
-#include <errno.h>
#include <anthy/anthy.h>
@@ -45,11 +43,16 @@
#include "plugin.h"
+#ifdef ENABLE_ANTHY_UTF8_STATIC
+void uim_anthy_utf8_plugin_instance_init(void);
+void uim_anthy_utf8_plugin_instance_quit(void);
+#endif
+
static uim_bool initialized;
static uim_lisp context_list;
-static iconv_t iconv_cd_e2u;
-static iconv_t iconv_cd_u2e;
+static void *iconv_cd_e2u;
+static void *iconv_cd_u2e;
static uim_lisp
@@ -82,10 +85,10 @@
encoding = uim_scm_c_int(encoding_);
if (!iconv_cd_e2u)
- iconv_cd_e2u = (iconv_t)uim_iconv->create("UTF-8", "EUC-JP");
+ iconv_cd_e2u = uim_iconv->create("UTF-8", "EUC-JP");
if (!iconv_cd_u2e)
- iconv_cd_u2e = (iconv_t)uim_iconv->create("EUC-JP", "UTF-8");
+ iconv_cd_u2e = uim_iconv->create("EUC-JP", "UTF-8");
ac = anthy_create_context();
if (ac) {
@@ -319,7 +322,7 @@
return uim_scm_make_str(" ");
str = uim_scm_refer_c_str(str_);
- convstr= uim_iconv->convert(iconv_cd_e2u, str);
+ convstr = uim_iconv->convert(iconv_cd_e2u, str);
utf8_ = uim_scm_make_str(convstr);
free(convstr);
@@ -337,19 +340,19 @@
return uim_scm_make_str("");
str = uim_scm_refer_c_str(str_);
- convstr= uim_iconv->convert(iconv_cd_u2e, str);
+ convstr = uim_iconv->convert(iconv_cd_u2e, str);
eucjp_ = uim_scm_make_str(convstr);
free(convstr);
return eucjp_;
}
-#ifndef ENABLE_ANTHY_STATIC
+#ifndef ENABLE_ANTHY_UTF8_STATIC
void
uim_plugin_instance_init(void)
#else
void
-uim_anthy_plugin_instance_init(void)
+uim_anthy_utf8_plugin_instance_init(void)
#endif
{
context_list = uim_scm_null();
@@ -376,12 +379,12 @@
uim_scm_init_subr_1("anthy-utf8-lib-utf8-to-eucjp", utf8_to_eucjp);
}
-#ifndef ENABLE_ANTHY_STATIC
+#ifndef ENABLE_ANTHY_UTF8_STATIC
void
uim_plugin_instance_quit(void)
#else
void
-uim_anthy_plugin_instance_quit(void)
+uim_anthy_utf8_plugin_instance_quit(void)
#endif
{
if (initialized) {
Modified: trunk/uim/anthy.c
==============================================================================
--- trunk/uim/anthy.c (original)
+++ trunk/uim/anthy.c Fri Jul 20 16:05:51 2007
@@ -41,6 +41,11 @@
#include "plugin.h"
+#ifdef ENABLE_ANTHY_STATIC
+void uim_anthy_plugin_instance_init(void);
+void uim_anthy_plugin_instance_quit(void);
+#endif
+
static uim_bool initialized;
static uim_lisp context_list;
Modified: trunk/uim/uim.c
==============================================================================
--- trunk/uim/uim.c (original)
+++ trunk/uim/uim.c Fri Jul 20 16:05:51 2007
@@ -55,6 +55,14 @@
};
static void *uim_get_candidate_internal(struct uim_get_candidate_args *args);
static uim_lisp get_nth_im(uim_context uc, int nth);
+#ifdef ENABLE_ANTHY_STATIC
+void uim_anthy_plugin_instance_init(void);
+void uim_anthy_plugin_instance_quit(void);
+#endif
+#ifdef ENABLE_ANTHY_UTF8_STATIC
+void uim_anthy_utf8_plugin_instance_init(void);
+void uim_anthy_utf8_plugin_instance_quit(void);
+#endif
static uim_bool uim_initialized;
static uim_lisp protected0, protected1;
@@ -97,6 +105,9 @@
#ifdef ENABLE_ANTHY_STATIC
uim_anthy_plugin_instance_init();
#endif
+#ifdef ENABLE_ANTHY_UTF8_STATIC
+ uim_anthy_utf8_plugin_instance_init();
+#endif
if (uim_issetugid()) {
scm_files = SCM_FILES;
@@ -122,6 +133,9 @@
uim_quit_plugin();
#ifdef ENABLE_ANTHY_STATIC
uim_anthy_plugin_instance_quit();
+#endif
+#ifdef ENABLE_ANTHY_UTF8_STATIC
+ uim_anthy_utf8_plugin_instance_quit();
#endif
uim_scm_quit();
uim_initialized = UIM_FALSE;
