Author: loonycyborg
Date: Sun Mar 22 20:53:11 2009
New Revision: 34051
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34051&view=rev
Log:
Made pkgconfig check add '' around package's name
to relieve check's caller from this responsibility.
Modified:
trunk/SConstruct
trunk/scons/pkgconfig.py
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=34051&r1=34050&r2=34051&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Mar 22 20:53:11 2009
@@ -219,7 +219,7 @@
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 \
Modified: trunk/scons/pkgconfig.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/pkgconfig.py?rev=34051&r1=34050&r2=34051&view=diff
==============================================================================
--- trunk/scons/pkgconfig.py (original)
+++ trunk/scons/pkgconfig.py Sun Mar 22 20:53:11 2009
@@ -7,7 +7,7 @@
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:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
