From: Jim Jagielski <jim@apache.org>
Date: Thu, 2 Mar 2017 12:26:26 +0000 (+0000)
Subject: Look for specific versioned installs of Lua 5.3
X-Git-Tag: 2.5.0-alpha~589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52112325c0630c4e95b562b67bcac6ac385a3904;p=apache

Look for specific versioned installs of Lua 5.3

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

diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index 18e9fe56ac..b2ac7b07dc 100644
--- a/modules/lua/config.m4
+++ b/modules/lua/config.m4
@@ -1,7 +1,7 @@
 
 APACHE_MODPATH_INIT(lua)
 
-dnl Check for Lua 5.2/5.1 Libraries
+dnl Check for Lua 5.3/5.2/5.1 Libraries
 dnl CHECK_LUA(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
 dnl Sets:
 dnl  LUA_CFLAGS
@@ -11,7 +11,7 @@ AC_DEFUN([CHECK_LUA],
 
 AC_ARG_WITH(
     lua,
-    [AC_HELP_STRING([--with-lua=PATH],[Path to the Lua 5.2/5.1 prefix])],
+    [AC_HELP_STRING([--with-lua=PATH],[Path to the Lua 5.3/5.2/5.1 prefix])],
     lua_path="$withval",
     :)
 
@@ -25,19 +25,19 @@ fi
 AC_CHECK_LIB(m, pow, lib_m="-lm")
 AC_CHECK_LIB(m, sqrt, lib_m="-lm")
 for x in $test_paths ; do
-    AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.2])
-    if test -f ${x}/include/lua-5.2/lua.h; then
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.3])
+    if test -f ${x}/include/lua-5.3/lua.h; then
         AC_MSG_RESULT([yes])
         save_CFLAGS=$CFLAGS
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
-        LDFLAGS="-L$x/lib/lua-5.2 $LDFLAGS $lib_m"
-        AC_CHECK_LIB(lua-5.2, luaL_newstate, [
-            LUA_LIBS="-L$x/lib/lua-5.2 -llua-5.2 $lib_m"
+        LDFLAGS="-L$x/lib/lua-5.3 $LDFLAGS $lib_m"
+        AC_CHECK_LIB(lua-5.3, luaL_newstate, [
+            LUA_LIBS="-L$x/lib/lua-5.3 -llua-5.3 $lib_m"
             if test "x$ap_platform_runtime_link_flag" != "x"; then
-               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua-5.2])
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua-5.3])
             fi
-            LUA_CFLAGS="-I$x/include/lua-5.2"
+            LUA_CFLAGS="-I$x/include/lua-5.3"
             ])
         CFLAGS=$save_CFLAGS
         LDFLAGS=$save_LDFLAGS
@@ -45,19 +45,19 @@ for x in $test_paths ; do
     else
         AC_MSG_RESULT([no])
     fi
-    AC_MSG_CHECKING([for lua.h in ${x}/include/lua5.2])
-    if test -f ${x}/include/lua5.2/lua.h; then
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua5.3])
+    if test -f ${x}/include/lua5.3/lua.h; then
         AC_MSG_RESULT([yes])
         save_CFLAGS=$CFLAGS
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
         LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
-        AC_CHECK_LIB(lua5.2, luaL_newstate, [
-            LUA_LIBS="-L$x/lib -llua5.2 $lib_m"
+        AC_CHECK_LIB(lua5.3, luaL_newstate, [
+            LUA_LIBS="-L$x/lib -llua5.3 $lib_m"
             if test "x$ap_platform_runtime_link_flag" != "x"; then
                APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib])
             fi
-            LUA_CFLAGS="-I$x/include/lua5.2"
+            LUA_CFLAGS="-I$x/include/lua5.3"
             ])
         CFLAGS=$save_CFLAGS
         LDFLAGS=$save_LDFLAGS
@@ -65,19 +65,19 @@ for x in $test_paths ; do
     else
         AC_MSG_RESULT([no])
     fi
-    AC_MSG_CHECKING([for lua.h in ${x}/include/lua52])
-    if test -f ${x}/include/lua52/lua.h; then
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua53])
+    if test -f ${x}/include/lua53/lua.h; then
         AC_MSG_RESULT([yes])
         save_CFLAGS=$CFLAGS
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
-        LDFLAGS="-L$x/lib/lua52 $LDFLAGS $lib_m"
+        LDFLAGS="-L$x/lib/lua53 $LDFLAGS $lib_m"
         AC_CHECK_LIB(lua, luaL_newstate, [
-            LUA_LIBS="-L$x/lib/lua52 -llua $lib_m"
+            LUA_LIBS="-L$x/lib/lua53 -llua $lib_m"
             if test "x$ap_platform_runtime_link_flag" != "x"; then
-               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua52])
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua53])
             fi
-            LUA_CFLAGS="-I$x/include/lua52"
+            LUA_CFLAGS="-I$x/include/lua53"
             ])
         CFLAGS=$save_CFLAGS
         LDFLAGS=$save_LDFLAGS
@@ -105,7 +105,66 @@ for x in $test_paths ; do
     else
         AC_MSG_RESULT([no])
     fi
-  
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.2])
+    if test -f ${x}/include/lua-5.2/lua.h; then
+        AC_MSG_RESULT([yes])
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="-L$x/lib/lua-5.2 $LDFLAGS $lib_m"
+        AC_CHECK_LIB(lua-5.2, luaL_newstate, [
+            LUA_LIBS="-L$x/lib/lua-5.2 -llua-5.2 $lib_m"
+            if test "x$ap_platform_runtime_link_flag" != "x"; then
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua-5.2])
+            fi
+            LUA_CFLAGS="-I$x/include/lua-5.2"
+            ])
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    else
+        AC_MSG_RESULT([no])
+    fi
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua5.2])
+    if test -f ${x}/include/lua5.2/lua.h; then
+        AC_MSG_RESULT([yes])
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
+        AC_CHECK_LIB(lua5.2, luaL_newstate, [
+            LUA_LIBS="-L$x/lib -llua5.2 $lib_m"
+            if test "x$ap_platform_runtime_link_flag" != "x"; then
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib])
+            fi
+            LUA_CFLAGS="-I$x/include/lua5.2"
+            ])
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    else
+        AC_MSG_RESULT([no])
+    fi
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua52])
+    if test -f ${x}/include/lua52/lua.h; then
+        AC_MSG_RESULT([yes])
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="-L$x/lib/lua52 $LDFLAGS $lib_m"
+        AC_CHECK_LIB(lua, luaL_newstate, [
+            LUA_LIBS="-L$x/lib/lua52 -llua $lib_m"
+            if test "x$ap_platform_runtime_link_flag" != "x"; then
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua52])
+            fi
+            LUA_CFLAGS="-I$x/include/lua52"
+            ])
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    else
+        AC_MSG_RESULT([no])
+    fi
     AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.1])
     if test -f ${x}/include/lua-5.1/lua.h; then
         AC_MSG_RESULT([yes])
@@ -172,13 +231,13 @@ AC_SUBST(LUA_LIBS)
 AC_SUBST(LUA_CFLAGS)
 
 if test -z "${LUA_LIBS}"; then
-  AC_MSG_WARN([*** Lua 5.2 or 5.1 library not found.])
+  AC_MSG_WARN([*** Lua 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.2 or 5.1 library is required])
+        AC_MSG_WARN([Lua 5.3 5.2 or 5.1 library is required])
     else
-        AC_MSG_ERROR([Lua 5.2 or 5.1 library is required])
+        AC_MSG_ERROR([Lua 5.3 5.2 or 5.1 library is required])
     fi,
     $2)
 else