summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-04-17 15:45:35 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-04-17 15:45:35 -0400
commit59526ba58d3d05050b4c22a50b2dedac405ae752 (patch)
treeae29c2f308765e99559f8e9ebe3a711501776627
parentf81dfbfe644b8ff6c8c08516ee2ee671d83f2f44 (diff)
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
-rw-r--r--configure.ac2
-rw-r--r--src/lib/ecore_imf/ecore_imf_module.c2
-rw-r--r--src/lib/ecore_x/ecore_x.c4
-rw-r--r--src/modules/ecore_imf/meson.build3
-rw-r--r--src/tests/ecore/ecore_test_ecore_imf.c2
5 files changed, 5 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 69b8fdf48a..c7be1c5b3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4479,7 +4479,7 @@ if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then
4479 [X11 XOpenIM], 4479 [X11 XOpenIM],
4480 [ 4480 [
4481 have_ecore_imf_xim=yes 4481 have_ecore_imf_xim=yes
4482 AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method]) 4482 AC_DEFINE([BUILD_ECORE_IMF_XIM], [1], [Enable X Input Method])
4483 ]) 4483 ])
4484fi 4484fi
4485 4485
diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index 0c6cee360d..391778f43b 100644
--- 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)
97 if ((!env) && (getenv("WAYLAND_DISPLAY")) && (!getenv("DISPLAY"))) 97 if ((!env) && (getenv("WAYLAND_DISPLAY")) && (!getenv("DISPLAY")))
98 env = "wayland"; 98 env = "wayland";
99#endif 99#endif
100#ifdef ENABLE_XIM 100#ifdef BUILD_ECORE_IMF_XIM
101 if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY"))) 101 if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY")))
102 env = "xim"; 102 env = "xim";
103#endif 103#endif
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index ae357df542..f3d8caeb20 100644
--- 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,
1223 XEvent ev; 1223 XEvent ev;
1224 1224
1225 XNextEvent(d, &ev); 1225 XNextEvent(d, &ev);
1226#ifdef ENABLE_XIM 1226#ifdef BUILD_ECORE_IMF_XIM
1227 /* Filter event for XIM */ 1227 /* Filter event for XIM */
1228 if (XFilterEvent(&ev, ev.xkey.window)) 1228 if (XFilterEvent(&ev, ev.xkey.window))
1229 continue; 1229 continue;
1230 1230
1231#endif /* ifdef ENABLE_XIM */ 1231#endif /* ifdef BUILD_ECORE_IMF_XIM */
1232 if ((ev.type >= 0) && (ev.type < _ecore_x_event_handlers_num)) 1232 if ((ev.type >= 0) && (ev.type < _ecore_x_event_handlers_num))
1233 { 1233 {
1234 if (_ecore_x_event_handlers[AnyXEvent]) 1234 if (_ecore_x_event_handlers[AnyXEvent])
diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index 97f021adff..b8a495a280 100644
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -15,9 +15,6 @@ foreach mod_name : mods
15 mod_src = [] 15 mod_src = []
16 mod_deps = [] 16 mod_deps = []
17 17
18 if loader_disabler.contains('xim') == false
19 config_h.set('ENABLE_'+mod_name.to_upper(), '1')
20 endif
21 if loader_disabler.contains(mod_name) == false 18 if loader_disabler.contains(mod_name) == false
22 mod_install_dir = join_paths(dir_package_modules, mod_name, version_name) 19 mod_install_dir = join_paths(dir_package_modules, mod_name, version_name)
23 subdir(mod_name) 20 subdir(mod_name)
diff --git a/src/tests/ecore/ecore_test_ecore_imf.c b/src/tests/ecore/ecore_test_ecore_imf.c
index 9851c77fa1..67571c40f5 100644
--- 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)
14EFL_END_TEST 14EFL_END_TEST
15 15
16static const char *built_modules[] = { 16static const char *built_modules[] = {
17#ifdef ENABLE_XIM 17#ifdef BUILD_ECORE_IMF_XIM
18 "xim", 18 "xim",
19#endif 19#endif
20#ifdef BUILD_ECORE_IMF_IBUS 20#ifdef BUILD_ECORE_IMF_IBUS