Author: loonycyborg
Date: Mon Mar 23 10:39:17 2009
New Revision: 34063
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34063&view=rev
Log:
Check for lua only if it's enabled.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=34063&r1=34062&r2=34063&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Mar 23 10:39:17 2009
@@ -218,10 +218,16 @@
conf.CheckSDL(require_version = '1.2.7') and \
conf.CheckSDL('SDL_net') or Warning("Base prerequisites are not met.")
+ def check_lua():
+ if env["lua"]:
+ return conf.CheckLua(require_version = "5.1")
+ else:
+ return True
+
have_client_prereqs = have_server_prereqs and \
conf.CheckPango("cairo") and \
conf.CheckPKG("fontconfig") and \
- conf.CheckLua(require_version = "5.1") and \
+ check_lua() and \
conf.CheckBoost("regex") and \
conf.CheckSDL("SDL_ttf", require_version = "2.0.8") and \
conf.CheckSDL("SDL_mixer", require_version = '1.2.0') and \
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
