xf86-video-ati: Branch 'master'

[Dave Airlie]

 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 65465d56c1bf943113518a5b2f57b3170213bab9
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Jul 2 18:38:38 2009 +1000

    radeon: fix up configure check better

diff --git a/configure.ac b/configure.ac
index 7535625..8cf69c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,6 @@ if test "$DRI" = yes; then
         CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS"
 	AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include <stdint.h>
 #include <stdlib.h>])
-#	DRM_MODE = no
 	if test "x$DRM_MODE" = xyes; then
 		PKG_CHECK_MODULES(LIBDRM_RADEON, [xorg-server >= 1.6 libdrm_radeon],
 		[LIBDRM_RADEON=yes], [LIBDRM_RADEON=no])
@@ -254,7 +253,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
 
 AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
 
-AM_CONDITIONAL(XF86DRM_MODE, test "x$DRM_MODE" = xyes)
+AM_CONDITIONAL(XF86DRM_MODE, test "x$LIBDRM_RADEON" = xyes)
 
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])