From 943f56a96b97ab602af9dee811af84c811d7b5e1 Mon Sep 17 00:00:00 2001 From: Philip Sequeira Date: Wed, 9 Dec 2020 22:11:33 -0500 Subject: build: fail configure if --lua is specified and Lua isn't found Should result in: "You manually enabled the feature 'lua', but the autodetection check failed." The moved bit of code was probably intended to do that all along, but it was running too late, so the code that actually checked for Lua didn't know it was explicitly asked for and quietly disabled it if not found. --- wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index 7481c8c42b..cee9086666 100644 --- a/wscript +++ b/wscript @@ -958,6 +958,9 @@ def configure(ctx): while re.match('\$\{([^}]+)\}', ctx.env[varname]): ctx.env[varname] = Utils.subst_vars(ctx.env[varname], ctx.env) + if ctx.options.LUA_VER: + ctx.options.enable_lua = True + ctx.parse_dependencies(build_options) ctx.parse_dependencies(main_dependencies) ctx.parse_dependencies(libav_dependencies) @@ -965,9 +968,6 @@ def configure(ctx): ctx.parse_dependencies(video_output_features) ctx.parse_dependencies(hwaccel_features) - if ctx.options.LUA_VER: - ctx.options.enable_lua = True - if ctx.options.SWIFT_FLAGS: ctx.env.SWIFT_FLAGS.extend(split(ctx.options.SWIFT_FLAGS)) -- cgit v1.2.3