From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 15 Aug 2023 21:39:54 +0000 (+0200)
Subject: Meson: Cleanup lua module
X-Git-Tag: rec-5.1.0-alpha1~80^2~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f42631927abf5c28cd4651101bec7e47c94d9c0e;p=thirdparty%2Fpdns.git

Meson: Cleanup lua module
---

diff --git a/meson/lua/meson.build b/meson/lua/meson.build
index 3a3ae09c3b..ab014f1882 100644
--- a/meson/lua/meson.build
+++ b/meson/lua/meson.build
@@ -1,16 +1,29 @@
-# Lua
-# Inputs: conf deps
-# Outputs: dep_lua
-
 opt_lua = get_option('lua')
 dep_lua = dependency('', required: false)
 
 if opt_lua == 'auto' or opt_lua == 'luajit'
-  dep_lua = dependency('luajit', version: '>= 2.0.2', required: opt_lua == 'luajit', not_found_message: 'LuaJIT not found')
+  dep_lua = dependency(
+    'luajit',
+    version: '>= 2.0.2',
+    required: opt_lua == 'luajit',
+    not_found_message: 'LuaJIT not found',
+  )
 endif
 
 if not dep_lua.found() and (opt_lua == 'auto' or opt_lua == 'lua')
-  variants = ['lua5.3', 'lua-5.3', 'lua53', 'lua5.2', 'lua-5.2', 'lua52', 'lua5.1', 'lua-5.1', 'lua51', 'lua']
+  variants = [
+    'lua5.3',
+    'lua-5.3',
+    'lua53',
+    'lua5.2',
+    'lua-5.2',
+    'lua52',
+    'lua5.1',
+    'lua-5.1',
+    'lua51',
+    'lua',
+  ]
+
   foreach variant: variants
     dep_lua = dependency(variant, version: '>= 5.1', required: false)
     if dep_lua.found()
@@ -25,8 +38,10 @@ endif
 
 have_luahpp = cxx.has_header('lua.hpp', dependencies: dep_lua)
 
-conf.set10('HAVE_LUA', dep_lua.found(), description: 'Whether we have Lua')
-conf.set10('HAVE_LUA_HPP', have_luahpp, description: 'Whether we have lua.hpp')
+conf.set('HAVE_LUA', dep_lua.found(), description: 'Lua')
+conf.set('HAVE_LUA_HPP', have_luahpp, description: 'Have <lua.hpp>')
 
-summary('Lua implementation', dep_lua.name(), section: 'Configuration')
-summary('Have lua.hpp', have_luahpp, bool_yn: true, section: 'Configuration')
+summary('Lua', dep_lua.found(), bool_yn: true, section: 'Lua')
+summary('Implementation', dep_lua.name(), section: 'Lua')
+summary('Version', dep_lua.version(), section: 'Lua')
+summary('Have <lua.hpp>', have_luahpp, bool_yn: true, section: 'Lua')