From 5933cfa1c4163f4ec5ce2fc38bb0324ff40b6635 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 18 Apr 2016 11:40:12 +0900 Subject: [PATCH] ecore_imf/wayland: Disable build wayland text input module wayland text input module will be moved into ISF Change-Id: I39327a3db7d155a248f7a2a9ad6b913e0c263b9c --- configure.ac | 17 +++++++++++++++-- packaging/efl.spec | 3 ++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6c71e0e..0e9dd69 100644 --- a/configure.ac +++ b/configure.ac @@ -3587,6 +3587,17 @@ AC_ARG_ENABLE([ibus], ], [want_ibus="yes"]) +AC_ARG_ENABLE([wayland-text-input], + [AS_HELP_STRING([--disable-wayland-text-input],[disable Wayland text input.])], + [ + if test "x${enableval}" = "xyes" ; then + want_wayland_text_input="yes" + else + want_wayland_text_input="no" + fi + ], + [want_wayland_text_input="yes"]) + ### Default values ### Checks for programs @@ -3875,7 +3886,9 @@ AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"]) EFL_ADD_FEATURE([ECORE_IMF], [xim]) # wayland -if test "x${want_ecore_imf_wayland}" = "xyes" ; then + +have_ecore_imf_wayland="no" +if text "x${want_wayland_text_input}" = "xyes" && test "x${want_ecore_imf_wayland}" = "xyes" ; then PKG_CHECK_MODULES([WAYLAND], [wayland-client >= 1.2.0 text-client], [ @@ -3886,7 +3899,7 @@ if test "x${want_ecore_imf_wayland}" = "xyes" ; then fi AM_CONDITIONAL([BUILD_ECORE_IMF_WAYLAND], [test "x${have_ecore_imf_wayland}" = "xyes"]) -EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${want_ecore_imf_wayland}]) +EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${have_ecore_imf_wayland}]) ### Checks for header files diff --git a/packaging/efl.spec b/packaging/efl.spec index 1617d60..cfb4814 100644 --- a/packaging/efl.spec +++ b/packaging/efl.spec @@ -682,6 +682,7 @@ CFLAGS+=" -DMESA_EGL_NO_X11_HEADERS " --with-glib=always \ --disable-xim \ --disable-scim \ + --disable-wayland-text-input \ --disable-gesture \ --with-tests=regular \ --enable-fb \ @@ -959,7 +960,7 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/efl.conf %{_libdir}/ecore_x/*/*/* %endif %{_libdir}/ecore_evas/engines/*/*/module.so -%{_libdir}/ecore_imf/modules/*/*/module.so +#%{_libdir}/ecore_imf/modules/*/*/module.so %{_libdir}/ecore/system/systemd/v-*/module.so %{_libdir}/ecore_buffer/modules/*/*/module.so %{_datadir}/ecore/checkme -- 2.7.4