summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-04-01 17:42:42 +0100
committerEmil Velikov <[email protected]>2014-04-25 21:09:26 +0100
commitc0953cf06e28da10f2e2481fb8ad90dc7c36f3d7 (patch)
treefb88a7b6bae5ccec7f6ece258d69f74c25218103 /src
parent6c44d43baed93058f3a778f485f7833e9c6f5307 (diff)
gallium/tests: conditionally include sw/dri winsys
In all fairness we allow the gallium tests to be build with --disable-dri which will result in the approapriate winsys to not be build, thus the build will fail. ./configure --disable-dri --with-gallium-drivers=svga --enable-gallium-tests Cc: Brian Paul <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/tests/trivial/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 3c26cd36c06..d795ab164d7 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -13,11 +13,15 @@ AM_CPPFLAGS = \
LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
- $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(GALLIUM_COMMON_LIB_DEPS)
+if HAVE_DRI
+LDADD += \
+ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
+endif
+
if NEED_WINSYS_XLIB
LDADD += \
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \