Merge remote branch 'origin/master' into pipe-video

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8ca274932cc7cb6fab9702fbc258784a03446dae..90b105cff53f467364d843cf6e64f39ee5fb3417 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1354,6 +1354,23 @@ if test "x$enable_gallium_nouveau" = xyes; then
 fi
 
 dnl
+<<<<<<< HEAD
+dnl Gallium G3DVL configuration
+dnl
+AC_ARG_ENABLE([gallium-g3dvl],
+    [AS_HELP_STRING([--enable-gallium-g3dvl],
+        [build gallium g3dvl @<:@default=disabled@:>@])],
+    [enable_gallium_g3dvl="$enableval"],
+    [enable_gallium_g3dvl=no])
+if test "x$enable_gallium_g3dvl" = xyes; then
+    vl_winsys_dirs=""
+    for dir in $GALLIUM_WINSYS_DIRS; do
+        vl_winsys_dirs="$vl_winsys_dirs g3dvl/$dir"
+    done
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $vl_winsys_dirs"
+fi
+
+=======
 dnl Gallium swrast configuration
 dnl
 AC_ARG_ENABLE([gallium-swrast],
@@ -1367,6 +1384,7 @@ fi
 
 dnl prepend CORE_DIRS to SRC_DIRS
 SRC_DIRS="$CORE_DIRS $SRC_DIRS"
+>>>>>>> origin/master
 
 dnl Restore LDFLAGS and CPPFLAGS
 LDFLAGS="$_SAVE_LDFLAGS"