Mesa (master): configure.ac: remove libdrm_radeon dependency for r300g and r600g

Marek Olšák mareko at kemper.freedesktop.org
Fri Feb 11 00:27:02 UTC 2011


Module: Mesa
Branch: master
Commit: 7da5105fb346db1d5c6b0b67109eba913d4c89fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7da5105fb346db1d5c6b0b67109eba913d4c89fd

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri Feb 11 01:16:06 2011 +0100

configure.ac: remove libdrm_radeon dependency for r300g and r600g

---

 configure.ac |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index f51542f..3bf9c68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1693,20 +1693,12 @@ AC_ARG_ENABLE([gallium-radeon],
     [enable_gallium_radeon="$enableval"],
     [enable_gallium_radeon=auto])
 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"
-    else
-	AC_MSG_WARN([libdrm_radeon is missing, not building gallium-radeon (r300)])
-    fi
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300"
 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
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
 fi
 
 dnl
@@ -1718,12 +1710,8 @@ AC_ARG_ENABLE([gallium-r600],
     [enable_gallium_r600="$enableval"],
     [enable_gallium_r600=auto])
 if test "x$enable_gallium_r600" = xyes; then
-    if test "x$HAVE_LIBDRM_RADEON" = xyes; then
-	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
-	gallium_check_st "r600/drm" "dri-r600"
-    else
-	AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-r600])
-    fi
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+    gallium_check_st "r600/drm" "dri-r600"
 fi
 
 dnl




More information about the mesa-commit mailing list