Author: cazfi
Date: Wed Apr 19 20:15:07 2017
New Revision: 35264

URL: http://svn.gna.org/viewcvs/freeciv?rev=35264&view=rev
Log:
Build tolua cmd only if sys tolua not used

See hrm Feature #652961

Modified:
    trunk/configure.ac
    trunk/dependencies/tolua-5.2/src/Makefile.am

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=35264&r1=35263&r2=35264&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Wed Apr 19 20:15:07 2017
@@ -1538,6 +1538,8 @@
     else
       AC_MSG_ERROR([tolua command not found from the system])
     fi
+  else
+    sys_tolua_cmd="true"
   fi
 elif test "x$sys_tolua_cmd" != "xfalse" ; then
   TOLUA=$sys_tolua_cmd
@@ -1551,6 +1553,8 @@
 TOLUA_LIBS="\$(top_builddir)/dependencies/tolua-5.2/src/lib/libtolua.la"
 AC_SUBST([TOLUA_CFLAGS])
 AC_SUBST([TOLUA_LIBS])
+
+AM_CONDITIONAL([SYS_TOLUA_CMD], [test "x$sys_tolua_cmd" != "xfalse"])
 
 dnl The BeOS sys/uio.h is broken.  This kludges it out of existence.
 dnl (This still causes lots of spurious changes to fc_config.h on BeOS.)

Modified: trunk/dependencies/tolua-5.2/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/Makefile.am?rev=35264&r1=35263&r2=35264&view=diff
==============================================================================
--- trunk/dependencies/tolua-5.2/src/Makefile.am        (original)
+++ trunk/dependencies/tolua-5.2/src/Makefile.am        Wed Apr 19 20:15:07 2017
@@ -1 +1,7 @@
-SUBDIRS = lib bin
+if SYS_TOLUA_CMD
+CMD_SUBDIR=
+else
+CMD_SUBDIR=bin
+endif
+
+SUBDIRS = lib $(CMD_SUBDIR)


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

Reply via email to