Project

General

Profile

Feature #1570 ยป 0072-Autotools-Use-lua-5.5.patch

Marko Lindqvist, 07/05/2025 06:23 AM

View differences:

configure.ac
dnl There's wide divergence on what the pkg-config file for Lua is called
dnl See http://lua-users.org/lists/lua-l/2008-09/msg00184.html
if test "x$sys_lua" = "xtrue" || test "x$sys_lua" = "xtest" ; then
PKG_CHECK_MODULES([LUA], [lua5.4], [sys_lua=true],
[PKG_CHECK_MODULES([LUA], [lua-5.4], [sys_lua=true],
[PKG_CHECK_MODULES([LUA], [lua >= 5.4 lua < 5.5], [sys_lua=true],
PKG_CHECK_MODULES([LUA], [lua5.5], [sys_lua=true],
[PKG_CHECK_MODULES([LUA], [lua-5.5], [sys_lua=true],
[PKG_CHECK_MODULES([LUA], [lua >= 5.5 lua < 5.6], [sys_lua=true],
[if test "x$sys_lua" = "xtrue" ; then
AC_MSG_ERROR([Use of included lua disabled, and no lua found from system])
fi
......
fi
AC_CHECK_FUNCS([popen pclose _longjmp _setjmp gmtime_r])
LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.4/src"
LUA_LIBS="\$(top_builddir)/dependencies/lua-5.4/src/liblua.la"
LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.5/src"
LUA_LIBS="\$(top_builddir)/dependencies/lua-5.5/src/liblua.la"
fi
AC_SUBST([LUA_CFLAGS])
......
data/icons/Makefile
utility/Makefile
dependencies/Makefile
dependencies/lua-5.4/Makefile
dependencies/lua-5.4/src/Makefile
dependencies/lua-5.5/Makefile
dependencies/lua-5.5/src/Makefile
dependencies/tolua-5.2/Makefile
dependencies/tolua-5.2/src/Makefile
dependencies/tolua-5.2/src/lib/Makefile
dependencies/Makefile.am
if SYS_LUA
LUASUBDIR =
else
LUASUBDIR = lua-5.4
LUASUBDIR = lua-5.5
endif
if TINYCTHREAD
    (1-1/1)