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

Generic PKGConfig checks are not needed.

Browse source
This commit is contained in:
Eric S. Raymond 2008-03-30 11:47:14 +00:00
parent eda6e9f488
commit 939283fdd0
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SConstruct
View file

@ -104,7 +104,7 @@ env.Default("all")
env.TargetSignatures('content')
#
# Most of our required runtime support is from Boost SDL.
# Generic pkg-config support is not presentluy used, but might be in the future
#
def CheckPKGConfig(context, version):
@ -113,6 +113,16 @@ def CheckPKGConfig(context, version):
context.Result( ret )
return ret
def CheckPKG(context, name):
context.Message( 'Checking for %s... ' % name )
ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0]
context.Result( ret )
return ret
#
# Most of our required runtime support is from Boost SDL.
#
def backup_env(env, vars):
backup = dict()
for var in vars:
@ -178,12 +188,6 @@ def CheckBoost(context, boost_lib, require_version = None):
context.Result("no")
return check_result
def CheckPKG(context, name):
context.Message( 'Checking for %s... ' % name )
ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0]
context.Result( ret )
return ret
def CheckSDL(context, sdl_lib = "SDL", require_version = None):
if require_version:
version = require_version.split(".", 2)
@ -306,8 +310,11 @@ conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
'CheckPNG' : CheckPNG,
'CheckBoost' : CheckBoost })
#if env["prereqs"]:
# conf.CheckPKGConfig('0.15.0') or Die("Base prerequisites are not met.")
if env["prereqs"]:
conf.CheckPKGConfig('0.15.0') and conf.CheckBoost("iostreams") or Die("Base prerequisites are not met.")
conf.CheckBoost("iostreams") or Die("Boost prerequisites are not met.")
have_client_prereqs = \
conf.CheckSDL(require_version = '1.2.7') and \