xf86-video-intel: configure.ac

[Chris Wilson]

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

New commits:
commit f25235a854e211f73cc44821b9a7c2a1a4092155
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 8 16:36:33 2013 +0100

    configure: Only assert DRI2 requirements not met if the DRI2 package is missing
    
    The new error message was added in
    commit ea30967245707ca4825de154e589a83dc605dae0 [2.99.902]
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Fri Sep 6 22:54:48 2013 +0000
    
        configure: Disable UXA build without DRI2
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 500eb10..0a63121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,13 +394,14 @@ fi
 AC_MSG_CHECKING([whether to include DRI2 support])
 AM_CONDITIONAL(DRI2, test "x$DRI2" = "xyes")
 AC_MSG_RESULT([$DRI2])
-if test "x$enable_dri" = "xyes" -a "x$KMS" = "xyes"; then
-	AC_MSG_ERROR([DRI2 requested but prerequisites not found])
-fi
 if test "x$DRI2" != "xno"; then
         AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support])
 	dri_msg="$dri_msg DRI2"
 else
+	if test "x$enable_dri" = "xyes" -a "x$KMS" = "xyes"; then
+		AC_MSG_ERROR([DRI2 requested but prerequisites not found])
+	fi
+
 	# UXA doesn't build without DRI2 headers, too late to fix
 	UXA=no
 fi