Author: cazfi
Date: Sat Feb  6 08:12:07 2016
New Revision: 31784

URL: http://svn.gna.org/viewcvs/freeciv?rev=31784&view=rev
Log:
When tolua command cannot be found from the system, list it in missing features.

See patch #6835

Modified:
    branches/S2_6/configure.ac
    branches/S2_6/m4/features.m4

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31784&r1=31783&r2=31784&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Sat Feb  6 08:12:07 2016
@@ -1393,13 +1393,13 @@
 fi
 
 AC_ARG_ENABLE([sys-tolua-cmd],
-  AS_HELP_STRING([--enable-sys-tolua-cmd], [use tolua command from system 
instead of one from freeciv tree [true when cross-compiling]]),
+  AS_HELP_STRING([--enable-sys-tolua-cmd], [use tolua command from build 
system instead of one from freeciv tree [true when cross-compiling]]),
 [case "${enableval}" in
   yes)
     sys_tolua_cmd=true ;;
   no)
     if test "x$cross_compiling" = "xyes" ; then
-      AC_MSG_ERROR([Must use external host tolua command when cross-compiling])
+      AC_MSG_ERROR([Must use external build system tolua command when 
cross-compiling])
     fi
     sys_tolua_cmd=false ;;
   *)
@@ -1416,6 +1416,7 @@
   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"
+      feature_systolua_cmd=missing
     else
       AC_MSG_ERROR([tolua command not found from the system])
     fi

Modified: branches/S2_6/m4/features.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/features.m4?rev=31784&r1=31783&r2=31784&view=diff
==============================================================================
--- branches/S2_6/m4/features.m4        (original)
+++ branches/S2_6/m4/features.m4        Sat Feb  6 08:12:07 2016
@@ -27,6 +27,7 @@
   FC_FEATURE([xz savegame compression], [$feature_xz], [liblzma])
   FC_FEATURE([threads suitable for threaded ai], [$feature_thr_cond], 
[pthreads])
   FC_FEATURE([lua linked from system], [$feature_syslua], [lua-5.3])
+  FC_FEATURE([tolua command from system], [$feature_systolua_cmd], [tolua])
   FC_FEATURE([IPv6 support], [$feature_ipv6], [IPv6 functions])
   FC_FEATURE([Ruleset Editor], [$feature_ruledit], [Qt5 development packages])
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to