Author: cazfi
Date: Fri Jan 22 08:16:46 2016
New Revision: 31531
URL: http://svn.gna.org/viewcvs/freeciv?rev=31531&view=rev
Log:
Use system tolua command by default, if found.
See patch #6789
Modified:
branches/S2_6/configure.ac
branches/S2_6/doc/README.packaging
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31531&r1=31530&r2=31531&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Fri Jan 22 08:16:46 2016
@@ -1403,13 +1403,17 @@
if test "x$cross_compiling" = "xyes" ; then
sys_tolua_cmd=true
else
- sys_tolua_cmd=false
+ sys_tolua_cmd=test
fi])
-if test "x$sys_tolua_cmd" = "xtrue" ; then
+if test "x$sys_tolua_cmd" = "xtrue" || test "x$sys_tolua_cmd" = "xtest" ; then
AC_PATH_PROG([TOLUA], [tolua], [notfound])
- if test x$TOLUA = xnotfound ; then
- AC_MSG_ERROR([tolua command not found from the system])
+ if test "x$TOLUA" = "xnotfound" ; then
+ if test "x$sys_tolua_cmd" = "xtest" ; then
+ TOLUA="\$(top_builddir)/dependencies/tolua-5.2/src/bin/tolua$EXEEXT"
+ else
+ AC_MSG_ERROR([tolua command not found from the system])
+ fi
fi
elif test "x$sys_tolua_cmd" != "xfalse" ; then
TOLUA=$sys_tolua_cmd
Modified: branches/S2_6/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.packaging?rev=31531&r1=31530&r2=31531&view=diff
==============================================================================
--- branches/S2_6/doc/README.packaging (original)
+++ branches/S2_6/doc/README.packaging Fri Jan 22 08:16:46 2016
@@ -29,8 +29,9 @@
* There's new configure option --enable-sys-tolua-cmd to use tolua
command from the build system when generating lua bindings. Plain
--enable-sys-tolua-cmd searches tolua from the PATH, other values
- are treated as full path to executable. You have to use system
- tolua when cross-compiling.
+ are treated as full path to executable. The default is to search
+ for tolua from the system. You have to use system tolua when
+ cross-compiling.
* Minimum libtool version is now 1.5.2
* For translation support minimum gettext version is now 0.14. It's
still possible to build completely without translation support
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
