From: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
Date: Mon, 4 Nov 2013 19:03:10 +0000 (-0200)
Subject: Release 0.0.2
X-Git-Tag: v0.0.2^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22aff324b5d1916c43ec4b0e952c7d32fa8d7bd1;p=profile%2Fivi%2Fweekeyboard.git

Release 0.0.2

Change-Id: I19cfecd74c7822f4c9910444f3337aa28f937a45
Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
---

diff --git a/configure.ac b/configure.ac
index 75721c8..b0cea57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([wkb_major], [0])
 m4_define([wkb_minor], [0])
-m4_define([wkb_micro], [1])
+m4_define([wkb_micro], [2])
 m4_define([wkb_version], [wkb_major.wkb_minor.wkb_micro])
 
 AC_PREREQ([2.64])
@@ -35,27 +35,15 @@ AC_ARG_WITH(edje-cc,
             [EDJE_CC_PATH=${withval}], [EDJE_CC_PATH=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc])
 AC_SUBST([EDJE_CC_PATH])
 
+PKG_CHECK_MODULES(IBUS, [eldbus eet efreet])
+AC_CHECK_PROG([have_ibus], [ibus], [yes], [no])
 
-AC_ARG_ENABLE([ibus],
-              [AC_HELP_STRING([--disable-ibus],
-                              [Disable integration with IBus input method system])],
-              [], [enable_ibus=yes])
+AS_IF([ test "x$have ibus" = "xno" ],
+      [ AC_MSG_ERROR([The ibus executable was not found.]) ])
 
-AM_CONDITIONAL(ENABLE_IBUS, test "x$enable_ibus" = "xyes")
-
-if test "x$enable_ibus" = "xyes"; then
-    PKG_CHECK_MODULES(IBUS, [eldbus eet efreet])
-    AC_CHECK_PROG([have_ibus], [ibus], [yes], [no])
-
-    AS_IF([ test "x$have ibus" = "xno" ],
-          [ AC_MSG_ERROR([The ibus executable was not found.]) ])
-
-    IBUS_ADDR=`ibus address > /dev/null 2>&1`
-    AS_IF([ test $? -ne 0 ],
-          [ AC_MSG_WARN([The ibus executable does not support 'address' argument.]) ])
-
-    AC_DEFINE(BUILD_IBUS, [1], [Build integration with IBus input method system])
-fi
+IBUS_ADDR=`ibus address > /dev/null 2>&1`
+AS_IF([ test $? -ne 0 ],
+      [ AC_MSG_WARN([The ibus executable does not support 'address' argument.]) ])
 
 WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index bb6c7a4..b9d641f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,9 +33,9 @@ weekeyboard_SOURCES=				\
 	text-client-protocol.h
 
 
-if ENABLE_IBUS
 noinst_PROGRAMS =				\
-	weekeyboard-config-eet-test
+	weekeyboard-config-eet-test		\
+	weekeyboard-ibus-test
 
 weekeyboard_config_eet_test_SOURCES =		\
 	wkb-log.c				\
@@ -46,8 +46,6 @@ weekeyboard_config_eet_test_SOURCES =		\
 	wkb-ibus-config-eet.h			\
 	wkb-ibus-config-eet-test.c
 
-noinst_PROGRAMS +=				\
-	weekeyboard-ibus-test
 
 weekeyboard_ibus_test_SOURCES =			\
 	wkb-ibus.h				\
@@ -64,7 +62,6 @@ weekeyboard_ibus_test_SOURCES =			\
 	wkb-ibus-config-eet.c			\
 	wkb-ibus-config-eet.h			\
 	wkb-ibus-test.c
-endif
 
 @wayland_scanner_rules@