From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 28 Sep 2010 17:32:32 +0000 (+0200)
Subject: configure.ac: do not build xorg-r300g by default
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11eb422a161153da6226042d0fea561161e4f292;p=mesa.git

configure.ac: do not build xorg-r300g by default

NOTE: This is a candidate for the 7.9 branch.
---

diff --git a/configure.ac b/configure.ac
index ca16edff507..364ee039470 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1532,14 +1532,22 @@ AC_ARG_ENABLE([gallium-radeon],
         [build gallium radeon @<:@default=disabled@:>@])],
     [enable_gallium_radeon="$enableval"],
     [enable_gallium_radeon=auto])
-if test "x$enable_gallium_radeon" = xyes || test "x$enable_gallium_radeon" = xauto; then
+if test "x$enable_gallium_radeon" = xauto; then
     if test "x$HAVE_LIBDRM_RADEON" = xyes; then
 	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-	gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+	gallium_check_st "radeon/drm" "dri-r300"
     else
 	AC_MSG_WARN([libdrm_radeon is missing, not building gallium-radeon (r300)])
     fi
 fi
+if test "x$enable_gallium_radeon" = xyes; then
+    if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+	gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+    else
+	AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-radeon (r300)])
+    fi
+fi
 
 dnl
 dnl Gallium Radeon r600g configuration