From: Giovanni Bechis <gbechis@apache.org>
Date: Mon, 10 Aug 2020 14:45:14 +0000 (+0000)
Subject: improve Lua 5.4 handling
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774a63154d010616dd4032738c9fe41c62af5be1;p=thirdparty%2Fapache%2Fhttpd.git

improve Lua 5.4 handling


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1880743 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index 9fefa626dec..40ae6f02416 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