From 5c1c6e74f0b382442564c71c224789886c776991 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 5 Dec 2022 17:17:38 +0200 Subject: [PATCH 41/41] Prefer freeciv tolua for native build See osdn #46199 Signed-off-by: Marko Lindqvist --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 262c345485..e5d50c9a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -1693,7 +1693,7 @@ if test x$enable_fcdb = xyes ; then fi AC_ARG_ENABLE([sys-tolua-cmd], - AS_HELP_STRING([--enable-sys-tolua-cmd], [use tolua command from build 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 [false for native build, true for cross-compile]]), [case "${enableval}" in yes) sys_tolua_cmd=true ;; @@ -1708,7 +1708,8 @@ esac], [ if test "x$cross_compiling" = "xyes" ; then sys_tolua_cmd=true else - sys_tolua_cmd=test + dnl Our own tolua is better than upstream one, so prefer it. + sys_tolua_cmd=false fi]) if test "x$sys_tolua_cmd" = "xtrue" || test "x$sys_tolua_cmd" = "xtest" ; then -- 2.35.1