From 3445e8bb921545f74e2b6a823d47fa29352e9262 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 22 Feb 2014 16:44:14 +0000 Subject: pipe-loader: wrap pipe_loader_sw_probe_xlib within HAVE_PIPE_LOADER_XLIB The above function implies using the the xlib winsys, which has additional library dependencies that should not be forced. Make the software xlib pipe loader optional thus avoid all the dependency hell. A user that wishes to use the particular pipe-loader would need to set the following within configure.ac. enable_gallium_xlib_loader=yes v2: - Wrap sw/xlib/xlib_sw_winsys.h to handle compilation on systems lacking X11 headers. Spotted by Christian Prochaska. Tested-by: Tom Stellard Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75356 Signed-off-by: Emil Velikov --- src/gallium/tests/trivial/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/gallium/tests/trivial') diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am index 656ee64e0f5..15a81b3a696 100644 --- a/src/gallium/tests/trivial/Makefile.am +++ b/src/gallium/tests/trivial/Makefile.am @@ -20,6 +20,13 @@ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(PTHREAD_LIBS) \ -lm +if NEED_PIPE_LOADER_XLIB +LDADD += \ + $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ + -lX11 -lXext -lXfixes \ + $(LIBDRM_LIBS) +endif + noinst_PROGRAMS = compute tri quad-tex compute_SOURCES = compute.c -- cgit v1.2.3