Mesa (master): scons: Gracefully handle pkg-config errors with libdrm_radeon.

[Vinson Lee]

Module: Mesa
Branch: master
Commit: 8c115aa247d4a2cfee5d35c5fdd6f56951060c6c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c115aa247d4a2cfee5d35c5fdd6f56951060c6c

Author: Vinson Lee <vlee at vmware.com>
Date:   Mon Jan 31 10:46:30 2011 -0800

scons: Gracefully handle pkg-config errors with libdrm_radeon.

Print warnings and continue build.

---

 src/gallium/winsys/r600/drm/SConscript   |    7 ++++++-
 src/gallium/winsys/radeon/drm/SConscript |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript
index f97434e..cc9a06a 100644
--- a/src/gallium/winsys/r600/drm/SConscript
+++ b/src/gallium/winsys/r600/drm/SConscript
@@ -13,7 +13,12 @@ r600_sources = [
     'r600_bomgr.c',
 ]
 
-env.ParseConfig('pkg-config --cflags libdrm_radeon')
+try:
+    env.ParseConfig('pkg-config --cflags libdrm_radeon')
+except OSError:
+    print 'warning: not building r600g'
+    Return()
+
 env.Append(CPPPATH = '#/src/gallium/drivers/r600')
 
 r600winsys = env.ConvenienceLibrary(
diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript
index 8081662..4ddb091 100644
--- a/src/gallium/winsys/radeon/drm/SConscript
+++ b/src/gallium/winsys/radeon/drm/SConscript
@@ -9,7 +9,12 @@ radeon_sources = [
     'radeon_r300.c',
 ]
 
-env.ParseConfig('pkg-config --cflags libdrm_radeon')
+try:
+    env.ParseConfig('pkg-config --cflags libdrm_radeon')
+except:
+    print 'warning: not building r300g'
+    Return()
+
 env.Append(CPPPATH = '#/src/gallium/drivers/r300')
 
 radeonwinsys = env.ConvenienceLibrary(