[uim-commit] r660 - in trunk: scm uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-02-15 06:57:41 -0800 (Tue, 15 Feb 2005)
New Revision: 660

Modified:
   trunk/scm/Makefile.am
   trunk/uim/uim.h
Log:
* scm/Makefile.am
  - Fix top_srcdir for LIBUIM_PLUGIN_LIB_DIR with top_builddir
  - Fix relative path for LIBUIM_SCM_FILES with absolute one. It must
    be ensured as absolute path.
  - Fix loading of installed-modules.scm when builddir != srcdir
  - Thanks Masanari Yamamoto for reporting

* uim/uim.h
  - (uim_create_context): Modifiy description abount enc argument


Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am	2005-02-15 12:07:45 UTC (rev 659)
+++ trunk/scm/Makefile.am	2005-02-15 14:57:41 UTC (rev 660)
@@ -61,21 +61,25 @@
 #  module_names += "scim"
 endif
 
+
+
 # TODO: resolve dependency to $(top_builddir)/uim/uim-sh in proper way
 installed-modules.scm: $(SCM_FILES)
 	$(MAKE) -C $(top_builddir)/uim uim-sh && \
 	$(ECHO) "(define installed-im-module-list '(" '$(module_names)' ")) \
-	      (require \"manage-modules.scm\") \
-	      (generate-installed-modules-scm)" \
-	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=$(top_srcdir)/scm LIBUIM_PLUGIN_LIB_DIR=$(top_srcdir)/uim/.libs \
+	         (require \"manage-modules.scm\") \
+	         (generate-installed-modules-scm)" \
+	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=`(cd $(top_srcdir) && pwd)`/scm LIBUIM_PLUGIN_LIB_DIR=$(top_builddir)/uim/.libs \
 	  $(top_builddir)/uim/uim-sh -B >$@
 
 # TODO: resolve dependency to $(top_builddir)/uim/uim-sh in proper way
 loader.scm: installed-modules.scm
 	$(MAKE) -C $(top_builddir)/uim uim-sh && \
 	$(ECHO) "(require \"manage-modules.scm\") \
-	      (generate-loader-scm)" \
-	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=$(top_srcdir)/scm LIBUIM_PLUGIN_LIB_DIR=$(top_srcdir)/uim/.libs \
+	         (require (string-append (getenv \"PWD\") \
+	                                 \"/installed-modules.scm\")) \
+	         (generate-loader-scm)" \
+	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=`(cd $(top_srcdir) && pwd)`/scm LIBUIM_PLUGIN_LIB_DIR=$(top_builddir)/uim/.libs \
 	  $(top_builddir)/uim/uim-sh -B >$@
 
 # $(ECHO) $(ECHO_N) >$@

Modified: trunk/uim/uim.h
===================================================================
--- trunk/uim/uim.h	2005-02-15 12:07:45 UTC (rev 659)
+++ trunk/uim/uim.h	2005-02-15 14:57:41 UTC (rev 660)
@@ -235,7 +235,7 @@
  * Currently selected input method is used if you specify both as NULL.
  *
  * @param ptr cookie value which is passed as an argument of uim's callback functions.
- * @param enc name of client encoding, say "UTF-8"
+ * @param enc iconv-acceptable name of client encoding. Say "UTF-8" to use most of input methods.
  * @param lang name language you want to input
  * @param engine name of conversion engine you want to use
  * @param conv character code converter. Say "uim_iconv" or place your own platform-specific, preferable implementation. See struct uim_code_converter.