xf86-video-ati: Branch 'master'

[Alan Coopersmith]

 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 30a19b75cc82b8e04c45e6684b84f9a4ccc0505b
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Jan 19 14:54:04 2010 -0800

    Fix configure with --disable-dri
    
    AM_CONDITIONAL calls can't be made inside if statements, since
    automake won't know what to do when the if isn't true.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/configure.ac b/configure.ac
index 2d64ff8..6155868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,6 @@ if test "$DRI" = yes; then
 
         save_CFLAGS="$CFLAGS"
         CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS"
-	AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
 	if test "$DRM_MODE" = yes; then
 	   	AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include <stdint.h>
 #include <stdlib.h>])
@@ -157,7 +156,10 @@ if test "$DRI" = yes; then
         	fi
 	fi
 	CFLAGS="$save_CFLAGS"
+else
+	DRM_MODE=no
 fi
+AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS"