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

Made pkgconfig check add '' around package's name

Browse source 
to relieve check's caller from this responsibility.
This commit is contained in:
Sergey Popov 2009-03-22 19:53:11 +00:00
parent afa0a16dd6
commit 738ddee7b9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -219,7 +219,7 @@ if env["prereqs"]:
have_client_prereqs = have_server_prereqs and \
conf.CheckPango("cairo") and \
conf.CheckPKG("fontconfig") and \
(conf.CheckPKG("lua '>=' 5.1") or conf.CheckPKG("lua5.1 '>=' 5.1")) and \
(conf.CheckPKG("lua >= 5.1") or conf.CheckPKG("lua5.1 >= 5.1")) 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 \

2
scons/pkgconfig.py
View file

@ -7,7 +7,7 @@ def CheckPKG(context, name):
context.Message( 'Checking for %s... ' % name )
try:
env["ENV"]["PKG_CONFIG_PATH"] = os.environ.get("PKG_CONFIG_PATH")
env.ParseConfig("pkg-config --libs --cflags $PKGCONFIG_FLAGS " + name)
env.ParseConfig("pkg-config --libs --cflags $PKGCONFIG_FLAGS '" + name + "'")
context.Result("yes")
return True
except OSError: