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 ca16edff50753a444d4e7ca52dac730e336d55b1..364ee0394703c38d5ef951f1915449a250a0340f 100644 (file)
--- 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