summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2012-02-06 15:53:45 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2012-02-06 15:53:45 +0900
commitf3ec209c0ad49a35afb1ce9d37ad6be9dddf2aba (patch)
tree348c2601acd3053a35edc4e2079e604472fbf18f
parentdc810769a06be481c364a5f7f2835068af7694eb (diff)
downloadibus-anthy-f3ec209c0ad49a35afb1ce9d37ad6be9dddf2aba.tar.gz
Added --with-layout option in configure for IBusEngineDesc.
New ibus 1.5 will use the IBusEngineDesc.layout but Japanese input method inherits the system keyboard layout so I added the configuration. Probably ibus-anthy would need IBusEngineDesc.layout = 'default'.
-rw-r--r--configure.ac15
-rw-r--r--engine/anthy.xml.in.in2
2 files changed, 16 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d1b3181..7d086e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,20 @@ else
fi
AC_SUBST(SYMBOL_XML)
+dnl - set ibus-anthy layout
+AC_ARG_WITH(layout,
+ [AC_HELP_STRING([--with-layout=LAYOUT],
+ [Define the layout. the default is 'jp'.
+ Probably you could set 'default'.])],
+ [LAYOUT="$withval"],
+ [LAYOUT="jp"])
+if test x"$LAYOUT" = x; then
+ LAYOUT_XML="<layout>jp</layout>"
+else
+ LAYOUT_XML="<layout>${LAYOUT}</layout>"
+fi
+AC_SUBST(LAYOUT_XML)
+
dnl - define GETTEXT_* variables
GETTEXT_PACKAGE=ibus-anthy
AC_SUBST(GETTEXT_PACKAGE)
@@ -190,4 +204,5 @@ KASUMI_EXEC_FILE $KASUMI_EXEC_FILE
KASUMI_ICON_FILE $KASUMI_ICON_FILE
HOTKEYS_XML $HOTKEYS_XML
SYMBOL_XML $SYMBOL_XML
+LAYOUT_XML $LAYOUT_XML
"
diff --git a/engine/anthy.xml.in.in b/engine/anthy.xml.in.in
index b2f9ee7..28bfa89 100644
--- a/engine/anthy.xml.in.in
+++ b/engine/anthy.xml.in.in
@@ -18,7 +18,7 @@
<license>GPL</license>
<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
<icon>${pkgdatadir}/icons/ibus-anthy.png</icon>
- <layout>jp</layout>
+ @LAYOUT_XML@
<longname>Anthy</longname>
<description>Anthy Input Method</description>
<rank>99</rank>