Hiroyuki Komatsu
komat****@users*****
2005年 3月 9日 (水) 17:42:51 JST
Index: prime/ChangeLog diff -u prime/ChangeLog:1.85 prime/ChangeLog:1.86 --- prime/ChangeLog:1.85 Tue Mar 8 20:24:57 2005 +++ prime/ChangeLog Wed Mar 9 17:42:51 2005 @@ -1,5 +1,11 @@ 2005-03-08 Hiroyuki Komatsu <komat****@taiya*****> + * Makefile.am: + A new command install-uim to install uim-prime files. + + * acinclude.m4: + A new procedure MY_AC_PROG_UIM to get the variable uim_scheme_dir. + * lib/session-japanese.rb: Fixed the critical bug that the lowest priority candidate will be returned. Index: prime/acinclude.m4 diff -u prime/acinclude.m4:1.5 prime/acinclude.m4:1.6 --- prime/acinclude.m4:1.5 Mon Mar 7 16:51:31 2005 +++ prime/acinclude.m4 Wed Mar 9 17:42:51 2005 @@ -1,5 +1,5 @@ dnl acinclude.m4: m4 macros for Autoconf -dnl $Id: acinclude.m4,v 1.5 2005/03/07 07:51:31 komatsu Exp $ +dnl $Id: acinclude.m4,v 1.6 2005/03/09 08:42:51 komatsu Exp $ dnl dnl Copyright (C) 2003, 2004 Hiroyuki Komatsu <komat****@taiya*****> dnl All rights reserved. @@ -25,3 +25,9 @@ AC_DEFUN([AC_RUBY_SITELIBDIR], ['$(libdir)/site_ruby/$(ruby_version)']) # [`ruby -r rbconfig -e "puts Config::MAKEFILE_CONFIG[['rubylibdir']]"`]) + +AC_DEFUN([MY_AC_PROG_UIM], +[ + AC_SUBST(uim_scheme_dir, + [`pkg-config uim --variable=prefix`"/share/uim"]) +]) Index: prime/configure.in diff -u prime/configure.in:1.29 prime/configure.in:1.30 --- prime/configure.in:1.29 Mon Mar 7 18:31:40 2005 +++ prime/configure.in Wed Mar 9 17:42:51 2005 @@ -1,5 +1,5 @@ dnl configure.in: Creates a configure script for prime of PRIME. -dnl $Id: configure.in,v 1.29 2005/03/07 09:31:40 komatsu Exp $ +dnl $Id: configure.in,v 1.30 2005/03/09 08:42:51 komatsu Exp $ dnl dnl Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****> dnl All rights reserved. @@ -19,6 +19,7 @@ AC_SUBST(DATE, "2004-03-07") MY_AC_PROG_RUBY +MY_AC_PROG_UIM # Checks for user options. AC_ARG_WITH(rubydir, @@ -60,7 +61,7 @@ # Output of configure files AC_CONFIG_FILES([Makefile src/Makefile grammar/Makefile lib/Makefile lib/engine/Makefile lib/grammar/Makefile lib/makedict/Makefile - etc/Makefile doc/Makefile doc/figures/Makefile + etc/Makefile uim/Makefile doc/Makefile doc/figures/Makefile doc/figures/src/Makefile doc/memo/Makefile lib/prime-config.rb prime.pc prime.spec packaging/Debian/debian/Makefile