From c0db7854d502d0b24110cbe8560967794d7938cb Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 5 Nov 2010 16:55:46 +0000 Subject: scons: Check for libdrm_[intel|radeon] as well And run SConscripts if they are present. Also make dri depend on both drm and x11. --- scons/gallium.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scons') diff --git a/scons/gallium.py b/scons/gallium.py index 36f1831af8..75e9b9e7fc 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -560,10 +560,14 @@ def generate(env): env.Tool('udis86') pkg_config_modules(env, 'x11', ['x11', 'xext']) - pkg_config_modules(env, 'dri', ['libdrm']) + pkg_config_modules(env, 'drm', ['libdrm']) + pkg_config_modules(env, 'drm_intel', ['libdrm_intel']) + pkg_config_modules(env, 'drm_radeon', ['libdrm_radeon']) pkg_config_modules(env, 'xorg', ['xorg-server']) pkg_config_modules(env, 'kms', ['libkms']) + env['dri'] = env['x11'] and env['drm'] + # Custom builders and methods env.Tool('custom') createInstallMethods(env) -- cgit v1.2.3