vl: Fix up configure.ac/Makefile

diff --git a/configure.ac b/configure.ac
index 90b105c..f9b5a32 100644 (file)
--- 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"

diff --git a/src/gallium/winsys/g3dvl/drm/nouveau/Makefile b/src/gallium/winsys/g3dvl/drm/nouveau/Makefile
index 7ff4484..fe41ac9 100644 (file)
--- a/src/gallium/winsys/g3dvl/drm/nouveau/Makefile
+++ b/src/gallium/winsys/g3dvl/drm/nouveau/Makefile
@@ -7,7 +7,7 @@ include $(TOP)/configs/current
 C_SOURCES =
 
 DRIVER_INCLUDES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-I) \
-                   -I$(TOP)/src/gallium/winsys/drm/nouveau \
+                   -I$(TOP)/src/gallium/winsys/drm/nouveau
 DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-other)
 
 PIPE_DRIVERS = \