build: use only BUILD_ECORE_IMF_XIM as a define

Summary:
meson and autotools were a bit out of sync with this, resulting in
unexpected behavior

Reviewers: billiob

Reviewed By: billiob

Subscribers: billiob, cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8641

diff --git a/configure.ac b/configure.ac
index 5af15a1..57061ba 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -4542,7 +4542,7 @@ if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then
    [X11 XOpenIM],
    [
      have_ecore_imf_xim=yes
-     AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
+     AC_DEFINE([BUILD_ECORE_IMF_XIM], [1], [Enable X Input Method])
    ])
 fi
 

diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index 0c6cee3..391778f 100644 (file)
--- a/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
@@ -97,7 +97,7 @@ ecore_imf_module_init(void)
    if ((!env) && (getenv("WAYLAND_DISPLAY")) && (!getenv("DISPLAY")))
      env = "wayland";
 #endif
-#ifdef ENABLE_XIM
+#ifdef BUILD_ECORE_IMF_XIM
    if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY")))
      env = "xim";
 #endif

diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index ae357df..f3d8cae 100644 (file)
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -1223,12 +1223,12 @@ _ecore_x_fd_handler(void *data,
         XEvent ev;
 
         XNextEvent(d, &ev);
-#ifdef ENABLE_XIM
+#ifdef BUILD_ECORE_IMF_XIM
         /* Filter event for XIM */
         if (XFilterEvent(&ev, ev.xkey.window))
           continue;
 
-#endif /* ifdef ENABLE_XIM */
+#endif /* ifdef BUILD_ECORE_IMF_XIM */
         if ((ev.type >= 0) && (ev.type < _ecore_x_event_handlers_num))
           {
              if (_ecore_x_event_handlers[AnyXEvent])

diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index 97f021a..b8a495a 100644 (file)
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -15,9 +15,6 @@ foreach mod_name : mods
   mod_src = []
   mod_deps = []
 
-  if loader_disabler.contains('xim') == false
-    config_h.set('ENABLE_'+mod_name.to_upper(), '1')
-  endif
   if loader_disabler.contains(mod_name) == false
     mod_install_dir =  join_paths(dir_package_modules, mod_name, version_name)
     subdir(mod_name)

diff --git a/src/tests/ecore/ecore_test_ecore_imf.c b/src/tests/ecore/ecore_test_ecore_imf.c
index 9851c77..67571c4 100644 (file)
--- a/src/tests/ecore/ecore_test_ecore_imf.c
+++ b/src/tests/ecore/ecore_test_ecore_imf.c
@@ -14,7 +14,7 @@ EFL_START_TEST(ecore_test_ecore_imf_init)
 EFL_END_TEST
 
 static const char *built_modules[] = {
-#ifdef ENABLE_XIM
+#ifdef BUILD_ECORE_IMF_XIM
   "xim",
 #endif
 #ifdef BUILD_ECORE_IMF_IBUS