Author: cazfi
Date: Thu Jan 15 18:23:50 2015
New Revision: 27699
URL: http://svn.gna.org/viewcvs/freeciv?rev=27699&view=rev
Log:
Use lua-5.3
See patch #5021
Modified:
branches/S2_6/configure.ac
branches/S2_6/dependencies/Makefile.am
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=27699&r1=27698&r2=27699&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Thu Jan 15 18:23:50 2015
@@ -1222,9 +1222,9 @@
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.2], [sys_lua=true],
- [PKG_CHECK_MODULES([LUA], [lua-5.2], [sys_lua=true],
- [PKG_CHECK_MODULES([LUA], [lua >= 5.2 lua < 5.3], [sys_lua=true],
+ PKG_CHECK_MODULES([LUA], [lua5.3], [sys_lua=true],
+ [PKG_CHECK_MODULES([LUA], [lua-5.3], [sys_lua=true],
+ [PKG_CHECK_MODULES([LUA], [lua >= 5.3 lua < 5.4], [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
@@ -1240,8 +1240,8 @@
fi
AC_CHECK_FUNCS([isatty popen _longjmp _setjmp])
- LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.2/src"
- LUA_LIBS="\$(top_builddir)/dependencies/lua-5.2/src/liblua.la"
+ LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.3/src"
+ LUA_LIBS="\$(top_builddir)/dependencies/lua-5.3/src/liblua.la"
fi
AC_SUBST([LUA_CFLAGS])
@@ -1431,8 +1431,8 @@
data/icons/Makefile
utility/Makefile
dependencies/Makefile
- dependencies/lua-5.2/Makefile
- dependencies/lua-5.2/src/Makefile
+ dependencies/lua-5.3/Makefile
+ dependencies/lua-5.3/src/Makefile
dependencies/tolua-5.2/Makefile
dependencies/tolua-5.2/src/Makefile
dependencies/tolua-5.2/src/lib/Makefile
Modified: branches/S2_6/dependencies/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/Makefile.am?rev=27699&r1=27698&r2=27699&view=diff
==============================================================================
--- branches/S2_6/dependencies/Makefile.am (original)
+++ branches/S2_6/dependencies/Makefile.am Thu Jan 15 18:23:50 2015
@@ -3,7 +3,7 @@
if SYS_LUA
LUASUBDIR =
else
-LUASUBDIR = lua-5.2
+LUASUBDIR = lua-5.3
endif
SUBDIRS = $(LUASUBDIR) tolua-5.2 cvercmp
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
