xf86-video-intel: 2 commits - configure.ac

[Chris Wilson]

 configure.ac |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit a8c7834e1d4d31097d0dd2c931d7662b5314a9b2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 22 22:03:17 2013 +0100

    configure: Supply a default value for dridriverdir
    
    Rather than fail to load DRI2 if not found.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 2b6ce91..e1c749b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,11 +426,10 @@ DRI2=no
 if test "x$enable_dri" != "xno"; then
 	PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], DRI2=yes, DRI2=no)
 	dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
-	if test "x$dridriverdir" != "x"; then
-		AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
-	else
-		DRI2=no
+	if test "x$dridriverdir" = "x"; then
+		dridriverdir="$libdir/dri"
 	fi
+	AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
 	if test "x$DRI2" != "xno"; then
 		save_CFLAGS=$CFLAGS
 		CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS"
commit 8d94f030c6af64f82d495a835a3b962480c068e7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 22 22:01:22 2013 +0100

    configure: Fix enabling of DRI2
    
    After setting it to false, we then need to set DRI2 to true after we
    detect the headers.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 0fcde50..2b6ce91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,7 +424,7 @@ fi
 
 DRI2=no
 if test "x$enable_dri" != "xno"; then
-	PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no)
+	PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], DRI2=yes, DRI2=no)
 	dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
 	if test "x$dridriverdir" != "x"; then
 		AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])