Permalink
Browse files

Add icon_prop_key support.

  • Loading branch information...
ikunya committed May 3, 2017
1 parent b6bda34 commit 1a428b490553b2c36bdc746a9d96c67db9081dcc
Showing with 15 additions and 1 deletion.
  1. +12 −0 configure.ac
  2. +2 −1 src/Makefile.am
  3. +1 −0 src/skk.xml.in.in
View
@@ -65,6 +65,18 @@ PKG_CHECK_MODULES(IBUS, [ibus-1.0 >= 1.4.0], ,
PKG_CHECK_EXISTS([ibus-1.0 >= 1.5.0], have_ibus_1_5=yes, have_ibus_1_5=no)
AM_CONDITIONAL([IBUS_1_5], [test x$have_ibus_1_5 = xyes])
# check icon_prop_key
AC_MSG_CHECKING([icon_prop_key support])
PKG_CHECK_EXISTS([ibus-1.0 >= 1.5.11], [icon_prop_key=yes], [icon_prop_key=no])
if test $icon_prop_key = yes; then
ICON_PROP_KEY_XML="<icon_prop_key>InputMode</icon_prop_key>"
AC_MSG_RESULT([yes])
else
ICON_PROP_KEY_XML="<!-- <icon_prop_key>InputMode</icon_prop_key> -->"
AC_MSG_RESULT([ibus 1.5.11 or later supports icon-prop-key in IBus.EngineDesc])
fi
AC_SUBST(ICON_PROP_KEY_XML)
# check libskk
PKG_CHECK_MODULES(LIBSKK, [libskk >= 1.0.2], ,
AC_MSG_ERROR([can't find libskk]))
View
@@ -78,7 +78,8 @@ setup_DATA = ibus-skk-preferences.ui
edit = sed \
-e 's|@VERSION[@]|$(VERSION)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@pkgdatadir[@]|$(pkgdatadir)|g'
-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
-e 's|@ICON_PROP_KEY_XML[@]|$(ICON_PROP_KEY_XML)|g'
desktop_in_in_files = ibus-setup-skk.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.in.in=.in)
View
@@ -23,6 +23,7 @@
<_description>SKK Input Method</_description>
<rank>70</rank>
<symbol>&#x3042;</symbol>
@ICON_PROP_KEY_XML@
</engine>
</engines>
</component>

0 comments on commit 1a428b4

Please sign in to comment.