summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorPhilip Sequeira <phsequei@gmail.com>2020-12-09 22:11:33 -0500
committersfan5 <sfan5@live.de>2020-12-22 00:11:05 +0100
commit943f56a96b97ab602af9dee811af84c811d7b5e1 (patch)
tree86faaf0396012b03c77d23906efd02341bfa2b6d /wscript
parent1ba5dc84caa1dfe4ee39e8a9947f863b43a52263 (diff)
downloadmpv-943f56a96b97ab602af9dee811af84c811d7b5e1.tar.bz2
mpv-943f56a96b97ab602af9dee811af84c811d7b5e1.tar.xz
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.
Diffstat (limited to 'wscript')
-rw-r--r--wscript6
1 files 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))