diff options
author | Grzegorz Blach <magik@roorback.net> | 2014-01-14 23:49:26 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-01-15 00:18:14 +0100 |
commit | 8255400e9cb93a6fc3914b856d8a03408f2325fa (patch) | |
tree | 89232e3302afd868756919e9d229f950dd053c41 | |
parent | 635b2f2690a838ab0f8efd3b8f5c14b6118352e6 (diff) | |
download | mpv-8255400e9cb93a6fc3914b856d8a03408f2325fa.tar.bz2 mpv-8255400e9cb93a6fc3914b856d8a03408f2325fa.tar.xz |
Detect Lua on FreeBSD
-rw-r--r-- | waftools/checks/custom.py | 2 | ||||
-rw-r--r-- | wscript | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 16f876e4a2..ce9735435d 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -52,10 +52,12 @@ def check_lua(ctx, dependency_identifier): lua_versions = [ ( '51', 'lua >= 5.1.0 lua < 5.2.0'), ( '51deb', 'lua5.1 >= 5.1.0'), # debian + ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD ( 'luajit', 'luajit >= 2.0.0' ), # assume all our dependencies (libquvi in particular) link with 5.1 ( '52', 'lua >= 5.2.0' ), ( '52deb', 'lua5.2 >= 5.2.0'), # debian + ( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD ] if ctx.options.LUA_VER: @@ -765,7 +765,7 @@ def options(opt): group.add_option('--lua', type = 'string', dest = 'LUA_VER', - help = "select Lua package which should be autodetected. Choices: 51 51deb 52 52deb luajit") + help = "select Lua package which should be autodetected. Choices: 51 51deb 51fbsd 52 52deb 52fbsd luajit") @conf def is_debug_build(ctx): |