From: Jose Fonseca <jfonseca@vmware.com>
Date: Mon, 16 May 2016 20:46:58 +0000 (+0100)
Subject: vl/dri: Move the DRI3 check out of sources include into C.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf010de6ee1b409d97f751705e5d8b26424cf025;p=mesa.git

vl/dri: Move the DRI3 check out of sources include into C.

Fixes SCons build.

Trivial.  Built locally with SCons and autotools.
---

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 44b3fec60d8..9b0c9a308be 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -352,13 +352,9 @@ VL_SOURCES := \
 # XXX: Nuke this as our dri targets no longer depend on VL.
 VL_WINSYS_SOURCES := \
 	vl/vl_winsys_dri.c \
+	vl/vl_winsys_dri3.c \
 	vl/vl_winsys_drm.c
 
-if HAVE_DRI3
-VL_WINSYS_SOURCES += \
-	vl/vl_winsys_dri3.c
-endif
-
 VL_STUB_SOURCES := \
 	vl/vl_stubs.c
 
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
index c69e67796c0..e438db3dff8 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
@@ -25,6 +25,8 @@
  *
  **************************************************************************/
 
+#if defined(HAVE_DRI3)
+
 #include <fcntl.h>
 
 #include <X11/Xlib-xcb.h>
@@ -704,3 +706,5 @@ free_screen:
    FREE(scrn);
    return NULL;
 }
+
+#endif // defined(HAVE_DRI3)