diff options
| author | Giovanni Bechis <gbechis@apache.org> | 2020-08-10 14:45:14 +0000 |
|---|---|---|
| committer | Giovanni Bechis <gbechis@apache.org> | 2020-08-10 14:45:14 +0000 |
| commit | 774a63154d010616dd4032738c9fe41c62af5be1 (patch) | |
| tree | d1b9a28287608fcdc55f4c94d3ab10709b6df485 /modules/lua | |
| parent | 66f47c5d3979274976ece570731b8763a4e97948 (diff) | |
| download | httpd-774a63154d010616dd4032738c9fe41c62af5be1.tar.gz | |
improve Lua 5.4 handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1880743 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/lua')
| -rw-r--r-- | modules/lua/config.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/lua/config.m4 b/modules/lua/config.m4 index 9fefa626de..40ae6f0241 100644 --- a/modules/lua/config.m4 +++ b/modules/lua/config.m4 @@ -70,6 +70,10 @@ if test -z "$LUA_VERSION"; then AC_CHECK_LIB(m, pow, lib_m="-lm") AC_CHECK_LIB(m, sqrt, lib_m="-lm") for x in $test_paths ; do + CHECK_LUA_PATH([${x}], [include/lua-5.4], [lib/lua-5.4], [lua-5.4]) + CHECK_LUA_PATH([${x}], [include/lua5.4], [lib], [lua5.4]) + CHECK_LUA_PATH([${x}], [include/lua54], [lib/lua54], [lua]) + CHECK_LUA_PATH([${x}], [include/lua-5.3], [lib/lua-5.3], [lua-5.3]) CHECK_LUA_PATH([${x}], [include/lua5.3], [lib], [lua5.3]) CHECK_LUA_PATH([${x}], [include/lua53], [lib/lua53], [lua]) @@ -90,13 +94,13 @@ AC_SUBST(LUA_LIBS) AC_SUBST(LUA_CFLAGS) if test -z "${LUA_LIBS}"; then - AC_MSG_WARN([*** Lua 5.3 5.2 or 5.1 library not found.]) + AC_MSG_WARN([*** Lua 5.4 5.3 5.2 or 5.1 library not found.]) ifelse([$2], , enable_lua="no" if test -z "${lua_path}"; then - AC_MSG_WARN([Lua 5.3 5.2 or 5.1 library is required]) + AC_MSG_WARN([Lua 5.4 5.3 5.2 or 5.1 library is required]) else - AC_MSG_ERROR([Lua 5.3 5.2 or 5.1 library is required]) + AC_MSG_ERROR([Lua 5.4 5.3 5.2 or 5.1 library is required]) fi, $2) else |