Mesa (7.9): configure.ac: do not build xorg-r300g by default

Marek Olšák mareko at kemper.freedesktop.org
Tue Sep 28 10:59:54 PDT 2010


Module: Mesa
Branch: 7.9
Commit: 7436872dce0bd4376a95032374022297046cfd1c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7436872dce0bd4376a95032374022297046cfd1c

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Sep 28 19:32:32 2010 +0200

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

NOTE: This is a candidate for the 7.9 branch.
(cherry picked from commit 11eb422a161153da6226042d0fea561161e4f292)

---

 configure.ac |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7651f31..2f3a47a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1528,14 +1528,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



More information about the mesa-commit mailing list