Author: crab
Date: Sat Apr 25 17:47:25 2009
New Revision: 35196
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35196&view=rev
Log:
Improved lua detection to work on FreeBSD7 (which uses lua-5.1.pc) Now scons
can compile trunk on FreeBSD7 without any os-specific patches.
Modified:
trunk/scons/lua.py
Modified: trunk/scons/lua.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/lua.py?rev=35196&r1=35195&r2=35196&view=diff
==============================================================================
--- trunk/scons/lua.py (original)
+++ trunk/scons/lua.py Sat Apr 25 17:47:25 2009
@@ -16,7 +16,7 @@
env.Append(LIBPATH = ["$luadir"], CPPPATH = ["$luadir/include"], LIBS
= "lua" + version)
found = True
else:
- found = run_pkg_config(context, "lua >= " + require_version) or
run_pkg_config(context, "lua" + version + " >= " + require_version)
+ found = run_pkg_config(context, "lua >= " + require_version) or
run_pkg_config(context, "lua" + version + " >= " + require_version) or
run_pkg_config(context, "lua-" + version + " >= " + require_version)
if not found:
try:
prefix, include = find_include([env["prefix"]], "lualib.h",
"", not env["host"])[0]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
