From edca5360cab6063a1dc2a388da800ca01eb86a42 Mon Sep 17 00:00:00 2001
From: Younes Manton <younes.m@gmail.com>
Date: Sat, 24 Apr 2010 13:52:23 -0400
Subject: vl: Fix up configure.ac/Makefile

---
 configure.ac | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 90b105cff53..f9b5a32782e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1354,7 +1354,6 @@ if test "x$enable_gallium_nouveau" = xyes; then
 fi
 
 dnl
-<<<<<<< HEAD
 dnl Gallium G3DVL configuration
 dnl
 AC_ARG_ENABLE([gallium-g3dvl],
@@ -1367,10 +1366,15 @@ if test "x$enable_gallium_g3dvl" = xyes; then
     for dir in $GALLIUM_WINSYS_DIRS; do
         vl_winsys_dirs="$vl_winsys_dirs g3dvl/$dir"
     done
+    # Hack, g3dvl dri state tracker is in winsys/g3dvl/dri
+    # and needs to be built before the drm bits
+    if test "$mesa_driver" = dri; then
+        vl_winsys_dirs="g3dvl/dri $vl_winsys_dirs"
+    fi
     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $vl_winsys_dirs"
 fi
 
-=======
+dnl
 dnl Gallium swrast configuration
 dnl
 AC_ARG_ENABLE([gallium-swrast],
@@ -1384,7 +1388,6 @@ fi
 
 dnl prepend CORE_DIRS to SRC_DIRS
 SRC_DIRS="$CORE_DIRS $SRC_DIRS"
->>>>>>> origin/master
 
 dnl Restore LDFLAGS and CPPFLAGS
 LDFLAGS="$_SAVE_LDFLAGS"
-- 
cgit v1.2.3