Revision: 7177
http://playerstage.svn.sourceforge.net/playerstage/?rev=7177&view=rev
Author: natepak
Date: 2008-11-27 13:58:59 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
Added patch 2280988
Modified Paths:
--------------
code/gazebo/trunk/SConstruct
code/gazebo/trunk/build.py
Modified: code/gazebo/trunk/SConstruct
===================================================================
--- code/gazebo/trunk/SConstruct 2008-11-27 13:09:50 UTC (rev 7176)
+++ code/gazebo/trunk/SConstruct 2008-11-27 13:58:59 UTC (rev 7177)
@@ -5,7 +5,7 @@
exec(open('build.py'))
-PKG_CONFIG_VERSION = '0.23'
+PKG_CONFIG_VERSION = '0.22'
OGRE_VERSION = '= 1.6.0'
ODE_VERSION = '>= 0.10.1'
@@ -110,7 +110,7 @@
'CheckPkg' : CheckPkg})
# Check for pkg-config
if not conf.CheckPkgConfig(PKG_CONFIG_VERSION):
- print ' Error: pkg-config version >= 0.23 not found.'
+ print ' Error: pkg-config version >= ' + PKG_CONFIG_VERSION + ' not found.'
Exit(1)
# Check for the correct OGRE version
Modified: code/gazebo/trunk/build.py
===================================================================
--- code/gazebo/trunk/build.py 2008-11-27 13:09:50 UTC (rev 7176)
+++ code/gazebo/trunk/build.py 2008-11-27 13:58:59 UTC (rev 7177)
@@ -43,6 +43,11 @@
def CheckPkg(context, name):
context.Message( 'Checking for %s...' % name)
action = 'PKG_CONFIG_PATH=%s pkg-config --exists \'%s\'' %
(os.environ['PKG_CONFIG_PATH'], name);
+ pkg_config_cmd = "pkg-config"
+ if os.environ.has_key("PKG_CONFIG_PATH"):
+ pkg_config_cmd = "PKG_CONFIG_PATH="+os.environ["PKG_CONFIG_PATH"]+"
pkg-config"
+ action = '%s --exists \'%s\'' % (pkg_config_cmd, name);
+
ret = context.TryAction(action)[0]
context.Result(ret)
return ret
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
