summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJan Arne Petersen <jpetersen@openismus.com>2013-04-17 11:59:46 +0200
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>2013-06-24 16:14:14 -0300
commitf656aa397f02d70dd51a4e450a021fb582b53732 (patch)
treeaf0765ef247e62203d7c4282d56de810e336dcb1 /configure.ac
parent1f298139d866ab8f5b77de300e7c356fca923e33 (diff)
ecore_imf: Add support for wayland
Add an input method module supporting the Wayland input method protocol. In v2: - Missing call to ecore_wl_shutdown() in im_module_shutdown() - Access the already stored 'wayland globals' with ecore_wl_globals_get() - Fixed compilation by adding -I(top_srcdir)/src/efl to CFLAGS - EFL formatting fixes Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 4a6a4bec41..556f996afc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2771,6 +2771,7 @@ want_ecore_imf="yes"
2771want_ecore_imf_xim="no" 2771want_ecore_imf_xim="no"
2772want_ecore_imf_scim="no" 2772want_ecore_imf_scim="no"
2773want_ecore_imf_ibus="no" 2773want_ecore_imf_ibus="no"
2774want_ecore_imf_wayland="no"
2774 2775
2775if test "${have_wince}" = "yes"; then 2776if test "${have_wince}" = "yes"; then
2776 want_ecore_imf="no" 2777 want_ecore_imf="no"
@@ -2782,6 +2783,9 @@ else
2782 want_ecore_imf_xim="yes" 2783 want_ecore_imf_xim="yes"
2783 want_ecore_imf_scim="yes" 2784 want_ecore_imf_scim="yes"
2784 want_ecore_imf_ibus="yes" 2785 want_ecore_imf_ibus="yes"
2786 if test "${want_wayland}" = "yes"; then
2787 want_ecore_imf_wayland="yes"
2788 fi
2785 fi 2789 fi
2786fi 2790fi
2787 2791
@@ -2851,6 +2855,20 @@ fi
2851AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"]) 2855AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"])
2852EFL_ADD_FEATURE([ECORE_IMF], [xim]) 2856EFL_ADD_FEATURE([ECORE_IMF], [xim])
2853 2857
2858# wayland
2859if test "x${want_ecore_imf_wayland}" = "xyes" ; then
2860 PKG_CHECK_MODULES([WAYLAND],
2861 [wayland-client],
2862 [
2863 have_ecore_imf_wayland="yes"
2864 AC_DEFINE([BUILD_ECORE_IMF_WAYLAND], [1], [Ecore Imf Wayland Support])
2865 ],
2866 [have_ecore_imf_wayland="no"])
2867fi
2868
2869AM_CONDITIONAL([BUILD_ECORE_IMF_WAYLAND], [test "x${have_ecore_imf_wayland}" = "xyes"])
2870EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${want_ecore_imf_wayland}])
2871
2854### Checks for header files 2872### Checks for header files
2855 2873
2856### Checks for types 2874### Checks for types