diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-12-06 20:51:26 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-12-06 20:56:07 +0000 |
| commit | 19f6be78c4326b7f5c60947e8f80e3372015a258 (patch) | |
| tree | fb5767aa4af65cfb12553de6a33962436efb0274 | |
| parent | fd6d03025a90ced5e11b9959561f489120763def (diff) | |
| download | efl-19f6be78c4326b7f5c60947e8f80e3372015a258.tar.gz | |
imf - make xim+scim the defaults not xim+ibus due to ibus being broken
at leats ibus seems to just not work for me on arch at least - even
with gtk apps, but scim does, so maybe make scim the main thing again?
also allows glib to be off by default. :)
| -rw-r--r-- | meson_options.txt | 4 | ||||
| -rw-r--r-- | src/modules/ecore_imf/meson.build | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt index dd9fa01dcf..13124c1b76 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -109,7 +109,7 @@ option('crypto', option('glib', type : 'boolean', - value : true, + value : false, description : 'Main loop integration for glib in efl' ) @@ -197,7 +197,7 @@ option('ecore-imf-loaders-disabler', type : 'array', description : 'List of input methods to disable in efl', choices : ['xim', 'ibus', 'scim'], - value : ['scim'] + value : ['ibus'] ) option('emotion-loaders-disabler', diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build index b8a495a280..72154d521d 100644 --- a/src/modules/ecore_imf/meson.build +++ b/src/modules/ecore_imf/meson.build @@ -16,6 +16,11 @@ foreach mod_name : mods mod_deps = [] if loader_disabler.contains(mod_name) == false + if mod_name == 'ibus' + if get_option('glib') == false + error('Need glib enabled if ibus is enabled') + endif + endif mod_install_dir = join_paths(dir_package_modules, mod_name, version_name) subdir(mod_name) module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_mod_extension) |