auth and rec: Allow selecting a specific version of Lua with meson

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/meson/lua-records/meson.build b/meson/lua-records/meson.build
index a13cea6505d93d023dc0a37156277789c1f893c3..6871bcf3d43cbdea59f54e8a871b656c5b453781 100644 (file)
--- a/meson/lua-records/meson.build
+++ b/meson/lua-records/meson.build
@@ -3,7 +3,7 @@ opt_lua_records = get_option('lua-records')
 dep_libcurl = dependency('libcurl', version: '>= 7.21.3', required: opt_lua_records)
 conf.set('HAVE_LIBCURL', dep_libcurl.found(), description: 'Whether we have libcurl')
 
-opt_lua_enabled = opt_lua in ['auto', 'luajit', 'lua']
+opt_lua_enabled = opt_lua in ['auto', 'luajit', 'lua', 'lua51', 'lua-5.1', 'lua5.1', 'lua52', 'lua-5.2', 'lua5.2', 'lua53', 'lua-5.3', 'lua5.3', 'lua54', 'lua-5.4', 'lua5.4']
 
 if not opt_lua_enabled
   error('Lua records require Lua, make sure it is enabled')

diff --git a/meson/lua/meson.build b/meson/lua/meson.build
index ab014f1882e02c263eb8974f024e1c8dfdbc7bde..db00e9871a897e29d1fb9d9e7e6d3998521df190 100644 (file)
--- a/meson/lua/meson.build
+++ b/meson/lua/meson.build
@@ -12,6 +12,9 @@ endif
 
 if not dep_lua.found() and (opt_lua == 'auto' or opt_lua == 'lua')
   variants = [
+    'lua5.4',
+    'lua-5.4',
+    'lua54',
     'lua5.3',
     'lua-5.3',
     'lua53',
@@ -32,6 +35,10 @@ if not dep_lua.found() and (opt_lua == 'auto' or opt_lua == 'lua')
   endforeach
 endif
 
+if not dep_lua.found() and opt_lua != 'lua' and opt_lua.startswith('lua')
+  dep_lua = dependency(opt_lua, version: '>= 5.1', required: false)
+endif
+
 if not dep_lua.found()
   error('No Lua implementation was found')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index e9b61ae147298b5d2738118bad4e31d64c47e673..994c8fccd561967317289344ee996d7637ca3db7 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua'], value: 'auto', description: 'Lua implementation to use')
+option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua', 'lua51', 'lua-5.1', 'lua5.1', 'lua52', 'lua-5.2', 'lua5.2', 'lua53', 'lua-5.3', 'lua5.3', 'lua54', 'lua-5.4', 'lua5.4'], value: 'auto', description: 'Lua implementation to use')
 option('hardening', type: 'feature', value: 'auto', description: 'Compiler security checks')
 option('hardening-experimental-cf', type: 'combo', choices: ['disabled', 'full', 'branch', 'return', 'check'], value: 'disabled', description: 'Control Flow hardening')
 option('hardening-experimental-scp', type: 'feature', value: 'disabled', description: 'Stack Clash Protection')

diff --git a/pdns/recursordist/meson_options.txt b/pdns/recursordist/meson_options.txt
index e1f6d7545e17600884a2378d9e3eb26e3b12befc..f0a3750ebc0801f240f9d9b9972c614fadae9031 100644 (file)
--- a/pdns/recursordist/meson_options.txt
+++ b/pdns/recursordist/meson_options.txt
@@ -1,4 +1,4 @@
-option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua'], value: 'auto', description: 'Lua implementation to use')
+option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua', 'lua51', 'lua-5.1', 'lua5.1', 'lua52', 'lua-5.2', 'lua5.2', 'lua53', 'lua-5.3', 'lua5.3', 'lua54', 'lua-5.4', 'lua5.4'], value: 'auto', description: 'Lua implementation to use')
 option('hardening', type: 'feature', value: 'auto', description: 'Compiler security checks')
 option('hardening-experimental-cf', type: 'combo', choices: ['disabled', 'full', 'branch', 'return', 'check'], value: 'disabled', description: 'Control Flow hardening')
 option('hardening-experimental-scp', type: 'feature', value: 'disabled', description: 'Stack Clash Protection')