Meson: Cleanup Lua and lua.hpp

diff --git a/meson.build b/meson.build
index 7d4c9da4c83c30f04c0ab007ae8e66d50afbe159..fc50f801c6848b8189ee217114f2f31252895a08 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -215,14 +215,14 @@ summary('Have strerror_r', have_strerror_r, section: 'System')
 summary('strerror_r returns char *', strerror_r_returns_charp, section: 'System')
 
 # Lua ------------------------------------------------------------------------------------
-lua_opt = get_option('lua')
+opt_lua = get_option('lua')
 dep_lua = dependency('', required: false)
 
-if lua_opt == 'auto' or lua_opt == 'luajit'
-  dep_lua = dependency('luajit', version: '>= 2.0.2', required: lua_opt == 'luajit', not_found_message: 'LuaJIT not found')
+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')
 endif
 
-if not dep_lua.found() and (lua_opt == 'auto' or lua_opt == 'lua')
+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']
   foreach variant: variants
     dep_lua = dependency(variant, version: '>= 5.1', required: false)
@@ -235,7 +235,6 @@ endif
 if not dep_lua.found()
   error('No Lua implementation was found')
 endif
-
 conf.set('HAVE_LUA', 1, description: 'Whether we have Lua')
 summary('Lua implementation', dep_lua.name(), section: 'Configuration')
 
@@ -244,7 +243,6 @@ if cxx.has_header('lua.hpp', dependencies: dep_lua)
   have_luahpp = true
   conf.set('HAVE_LUA_HPP', 1, description: 'Whether we have lua.hpp')
 endif
-
 summary('Have lua.hpp', have_luahpp, bool_yn: true, section: 'Configuration')
 # Generate config.h ----------------------------------------------------------------------
 config_h = configure_file(configuration: conf, output: 'config.h')