X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=9f14ccfd726ca2b15b0723a8e20f03d8cdc53e03;hb=refs%2Fheads%2Fmaster;hp=5e4d1dc9ee3322e705926150b3b73011d4e62627;hpb=f7a6a3b02563b125bc5b46b62be9bcc973282929;p=profile%2Fivi%2Fweekeyboard.git diff --git a/configure.ac b/configure.ac index 5e4d1dc..9f14ccf 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]) @@ -27,35 +27,31 @@ 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(WAYLAND, [wayland-client >= 1.3.0]) +PKG_CHECK_MODULES(EFL, [eina >= 1.8.0 + evas >= 1.8.0 + ecore >= 1.8.0 + ecore-evas >= 1.8.0 + ecore-wayland >= 1.8.0 + edje >= 1.8.0]) 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 >= 1.8.0 + eet >= 1.8.0 + efreet >= 1.8.0]) -AC_ARG_ENABLE([ibus], - [AC_HELP_STRING([--disable-ibus], - [Disable integration with IBus input method system])], - [], [enable_ibus=yes]) +AC_CHECK_PROG([have_ibus], [ibus], [yes], [no]) -AM_CONDITIONAL(ENABLE_IBUS, test "x$enable_ibus" = "xyes") +AS_IF([ test "x$have ibus" = "xno" ], + [ AC_MSG_ERROR([The ibus executable was not found.]) ]) -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.]) ]) - - 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'])