cedric pushed a commit to branch ecore-1.7.
commit 280fc24fac279e72aae3fdf2bc3a720a77021aab
Author: Leandro Dorileo <[email protected]>
Date: Thu Feb 28 18:15:26 2013 -0300
ecore: ibus needs ecore_evas
If we don't have_ecore_evas ibus will fail to build since it makes use
of ecore evas API.
---
configure.ac | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index e4a0d79..f83c3a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1642,23 +1642,6 @@ fi
ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM],
[${ecore_imf_scim_deps}],
[requirements_ecore_imf_scim="ecore-imf >= 1.7.5 ecore-x >= 1.7.5
ecore-input >= 1.7.5 ${requirements_ecore_imf_scim}"])
-# ecore_imf_ibus
-PKG_CHECK_MODULES([IBUS], [ibus-1.0 >= 1.4], [have_ibus="yes"],
[have_ibus="no"])
-
-AM_CONDITIONAL(BUILD_ECORE_IMF_IBUS, false)
-ecore_imf_ibus_deps="no"
-echo "have_ecore_x_xlib: ${have_ecore_x_xlib}"
-if test "x${have_ecore_imf}" = "xyes" \
- -a "x${have_glib}" = "xyes" \
- -a "x${have_ibus}" = "xyes" \
- -a "x${have_ecore_input}" = "xyes" ; then
- ecore_imf_ibus_deps="yes"
- AC_DEFINE(BUILD_ECORE_IMF_IBUS, 1, [Ecore Imf IBUS Support])
-fi
-
-ECORE_CHECK_MODULE([imf-ibus], [${want_ecore_imf}], [Imf_IBUS],
[${ecore_imf_ibus_deps}],
- [requirements_ecore_imf_ibus="ecore-imf >= 1.7.5 ecore-x >= 1.7.5
ecore-input >= 1.7.5 ${requirements_ecore_imf_ibus}"])
-
## Graphic systems
# ecore_x{cb}
@@ -1951,6 +1934,24 @@ ECORE_EVAS_CHECK_MODULE([psl1ght],
[${have_ecore_psl1ght}],
[requirements_ecore_evas="ecore-psl1ght >= 1.7.5
${requirements_ecore_evas}"])
+# ecore_imf_ibus
+PKG_CHECK_MODULES([IBUS], [ibus-1.0 >= 1.4], [have_ibus="yes"],
[have_ibus="no"])
+
+AM_CONDITIONAL(BUILD_ECORE_IMF_IBUS, false)
+ecore_imf_ibus_deps="no"
+echo "have_ecore_x_xlib: ${have_ecore_x_xlib}"
+if test "x${have_ecore_imf}" = "xyes" \
+ -a "x${have_ecore_evas}" = "xyes" \
+ -a "x${have_glib}" = "xyes" \
+ -a "x${have_ibus}" = "xyes" \
+ -a "x${have_ecore_input}" = "xyes" ; then
+ ecore_imf_ibus_deps="yes"
+ AC_DEFINE(BUILD_ECORE_IMF_IBUS, 1, [Ecore Imf IBUS Support])
+fi
+
+ECORE_CHECK_MODULE([imf-ibus], [${want_ecore_imf}], [Imf_IBUS],
[${ecore_imf_ibus_deps}],
+ [requirements_ecore_imf_ibus="ecore-imf >= 1.7.5 ecore-x >= 1.7.5
ecore-input >= 1.7.5 ${requirements_ecore_imf_ibus}"])
+
### WAYLAND
ecore_wayland_deps="no"
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
