Author: cazfi
Date: Fri Jan 22 08:16:38 2016
New Revision: 31530
URL: http://svn.gna.org/viewcvs/freeciv?rev=31530&view=rev
Log:
Use system tolua command by default, if found.
See patch #6789
Modified:
trunk/configure.ac
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=31530&r1=31529&r2=31530&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Jan 22 08:16:38 2016
@@ -1441,13 +1441,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
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
