From 8255400e9cb93a6fc3914b856d8a03408f2325fa Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Tue, 14 Jan 2014 23:49:26 +0100 Subject: Detect Lua on FreeBSD --- waftools/checks/custom.py | 2 ++ wscript | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 e6e70c23ed..b76e547572 100644 --- a/wscript +++ b/wscript @@ -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): -- cgit v1.2.3