Mesa (7.11): configure.ac: Check for the respective libdrm_* when building gallium drivers

Marek Olšák mareko at kemper.freedesktop.org
Thu Jul 21 13:05:23 UTC 2011


Module: Mesa
Branch: 7.11
Commit: 4cbaa2283c3729773ae3a75d13e2e7d8cb375196
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4cbaa2283c3729773ae3a75d13e2e7d8cb375196

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Jul 21 14:57:19 2011 +0200

configure.ac: Check for the respective libdrm_* when building gallium drivers

In a rare case of building gallium only, we need to
check if the required packages are available

libdrm_[intel|nouveau] - gallium[i915 i965|nouveau]

v2: r300g and r600g do not need libdrm_radeon

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Marek Olšák <maraeo at gmail.com>
(cherry picked from commit c2426bbf862850504f24e7d9765e64a75b873f3b)

Conflicts:

	configure.ac

---

 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7d96ed9..d4bf2a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1786,9 +1786,11 @@ if test "x$with_gallium_drivers" != x; then
             gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
             ;;
         xi915)
+            PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
             gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
             ;;
         xi965)
+            PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
             gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
             ;;
         xr300)
@@ -1800,6 +1802,7 @@ if test "x$with_gallium_drivers" != x; then
             gallium_check_st "r600/drm" "dri-r600"
             ;;
         xnouveau)
+            PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"
             gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
             ;;




More information about the mesa-commit mailing list