discomfitor pushed a commit to branch enlightenment-0.22. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2e956cb089bc8abab2e222fd0ae6b28fb180ad78
commit 2e956cb089bc8abab2e222fd0ae6b28fb180ad78 Author: Mike Blumenkrantz <[email protected]> Date: Fri Nov 3 14:35:43 2017 -0400 check meson module option state before executing subdir fix module disabling --- src/modules/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index 337ce9c4c..01e335fc7 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -79,7 +79,6 @@ mods = [ foreach m: mods desktop_only = false no_icon = false - disable = false cargs = '' data = [] deps = [] @@ -87,11 +86,14 @@ foreach m: mods _dir = join_paths(dir_module_e, m) _dir_bin = join_paths(_dir, module_arch) - subdir(m) - opt = '-'.join(m.split('_')) + disable = get_option(opt) + + if disable == true + subdir(m) + endif - if get_option(opt) == true and disable == false + if disable == true _inc2 = [] foreach i: inc --
