Author: loonycyborg
Date: Tue Oct 14 12:17:26 2008
New Revision: 30156
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30156&view=rev
Log:
Forward PKG_CONFIG_PATH since env.ParseConfig does no longer runs
pkg-config with access to environment.
Modified:
trunk/scons/pango.py
trunk/scons/pkgconfig.py
Modified: trunk/scons/pango.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/pango.py?rev=30156&r1=30155&r2=30156&view=diff
==============================================================================
--- trunk/scons/pango.py (original)
+++ trunk/scons/pango.py Tue Oct 14 12:17:26 2008
@@ -15,6 +15,7 @@
env["PKGCONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
try:
+ env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH")
env.ParseConfig("pkg-config --libs --cflags $PKGCONFIG_FLAGS pango" +
backend)
context.Result("yes")
return True
Modified: trunk/scons/pkgconfig.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/pkgconfig.py?rev=30156&r1=30155&r2=30156&view=diff
==============================================================================
--- trunk/scons/pkgconfig.py (original)
+++ trunk/scons/pkgconfig.py Tue Oct 14 12:17:26 2008
@@ -1,9 +1,12 @@
# vi: syntax=python:et:ts=4
+
+import os
def CheckPKG(context, name):
env = context.env
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)
context.Result("yes")
return True
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
