diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-30 22:44:16 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-31 00:55:44 -0400 |
| commit | 64aff80d862c67b5058336095d44e41ef75bce0a (patch) | |
| tree | c8c98d3f512568528dbfa3a20092d8a89234b7f5 | |
| parent | 89cd3d8b9da5c22d3aa16b54df45946b8d6683df (diff) | |
| download | lighttpd-git-64aff80d862c67b5058336095d44e41ef75bce0a.tar.gz | |
[build] prepend search for lua version 5.4
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/meson.build | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -579,7 +579,7 @@ if 1: if env['with_lua']: found_lua = False - for lua_name in ['lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua']: + for lua_name in ['lua5.4', 'lua-5.4', 'lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua']: print("Searching for lua: " + lua_name + " >= 5.0") if autoconf.CheckParseConfigForLib('LIBLUA', "pkg-config '" + lua_name + " >= 5.0' --cflags --libs"): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_LUA_H' ]) diff --git a/configure.ac b/configure.ac index 44dd6e77..246692a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1359,7 +1359,7 @@ if test "$WITH_LUA" != no; then LUA_CFLAGS="-I$WITH_LUA" fi else - for luaname in lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do + for luaname in lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do if test "$found_lua" = "0"; then PKG_CHECK_MODULES([LUA], [$luaname >= 5.1], [found_lua=1], diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 604aba28..d6c24f72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -645,7 +645,7 @@ else() endif() if(WITH_LUA) - pkg_search_module(LUA REQUIRED lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua) + pkg_search_module(LUA REQUIRED lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua) message(STATUS "found lua at: INCDIR: ${LUA_INCLUDE_DIRS} LIBDIR: ${LUA_LIBRARY_DIRS} LDFLAGS: ${LUA_LDFLAGS} CFLAGS: ${LUA_CFLAGS}") set(HAVE_LIBLUA 1 "Have liblua") set(HAVE_LUA_H 1 "Have liblua header") diff --git a/src/meson.build b/src/meson.build index 4e90030c..c618a3b7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -380,7 +380,7 @@ endif liblua = [] if get_option('with_lua') found_lua = false - foreach l: ['lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua'] + foreach l: ['lua5.4', 'lua-5.4', 'lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua'] if not(found_lua) liblua = dependency(l, required: false) if (liblua.found()) |