summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrzegorz Blach <magik@roorback.net>2014-01-14 23:49:26 +0100
committerwm4 <wm4@nowhere>2014-01-15 20:57:17 +0100
commitc06000eef8a80bb64caaa613c1a39a3a8c6e96d0 (patch)
tree1be34a79f4b830f73463fe63972e3e5e68b8ae60
parent1bc1cd2305c65521010a3fa221ac785ac30b8d2d (diff)
downloadmpv-c06000eef8a80bb64caaa613c1a39a3a8c6e96d0.tar.bz2
mpv-c06000eef8a80bb64caaa613c1a39a3a8c6e96d0.tar.xz
Detect Lua on FreeBSD
-rw-r--r--waftools/checks/custom.py2
-rw-r--r--wscript2
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:
diff --git a/wscript b/wscript
index 143a88a94e..32273095bc 100644
--- a/wscript
+++ b/wscript
@@ -766,7 +766,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):