0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added some diagnostic output to lua and pkg-config checks.

Browse source 
(written to build/config.log)
This commit is contained in:
Sergey Popov 2009-03-27 13:48:45 +00:00
parent f19234e833
commit 01de0050e6
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scons/lua.py
View file

@ -16,11 +16,12 @@ def CheckLua(context, require_version):
env.Append(LIBPATH = ["$luadir"], CPPPATH = ["$luadir/include"], LIBS = "lua" + version)
found = True
else:
found = run_pkg_config(env, "lua >= " + require_version) or run_pkg_config(env, "lua" + version + " >= " + require_version)
found = run_pkg_config(context, "lua >= " + 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]
found = True
context.Log("Found Lua header " + include + ".\n")
env.Append(LIBPATH = [join(prefix, "lib")], CPPPATH = [join(prefix, "include")], LIBS = ["lua"])
except IndexError:
pass

7
scons/pkgconfig.py
View file

@ -2,18 +2,21 @@
import os
def run_pkg_config(env, name):
def run_pkg_config(context, name):
env = context.env
try:
env["ENV"]["PKG_CONFIG_PATH"] = os.environ.get("PKG_CONFIG_PATH")
env.ParseConfig("pkg-config --libs --cflags --silence-errors $PKGCONFIG_FLAGS \"" + name + "\"")
context.Log("Found '" + name + "' with pkg-config.\n")
return True
except OSError:
context.Log("Failed to find '" + name + "' with pkg-config.\n")
return False
def CheckPKG(context, name):
env = context.env
context.Message( 'Checking for %s... ' % name )
if run_pkg_config(env, name):
if run_pkg_config(context, name):
context.Result("yes")
return True
else: