Added dependency of ibus engines

[profile/ivi/weekeyboard.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e114d0d..b0cea57 100644 (file)
--- 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])
@@ -13,7 +13,7 @@ AC_SUBST([weekeyboard_VERSION], [wkb_version])
 
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.11 -Wall -Wextra parallel-tests foreign color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests foreign color-tests dist-bzip2])
 
 AM_SILENT_RULES([yes])
 
@@ -28,36 +28,30 @@ LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG()
 
 PKG_CHECK_MODULES(WAYLAND, [wayland-client >= 1.2.0])
-PKG_CHECK_MODULES(EFL, [eina eet evas ecore ecore-evas ecore-wayland edje])
+PKG_CHECK_MODULES(EFL, [eina evas ecore ecore-evas ecore-wayland edje])
 
 AC_ARG_WITH(edje-cc,
             AS_HELP_STRING([--with-edje-cc=PATH], [Path to edje_cc binary]),
             [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")
+IBUS_ADDR=`ibus address > /dev/null 2>&1`
+AS_IF([ test $? -ne 0 ],
+      [ AC_MSG_WARN([The ibus executable does not support 'address' argument.]) ])
 
-if test "x$enable_ibus" = "xyes"; then
-    PKG_CHECK_MODULES(ELDBUS, [eldbus])
-    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.]) ])
+WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
 
-    AC_DEFINE(BUILD_IBUS, [1], [Build integration with IBus input method system])
-fi
+CFLAGS="$CFLAGS -Wextra -Wno-unused-parameter"
+AC_SUBST(CFLAGS)
 
-WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
+CXXFLAGS="$CXXFLAGS -Wextra -Wno-unused-parameter"
+AC_SUBST(CXXFLAGS)
 
 AC_CONFIG_FILES([Makefile
                 src/Makefile