Rather than defining our own set of variables, use NEED_WINSYS_XLIB and based on it include the sw/xlib winsys.
Signed-off-by: Emil Velikov <[email protected]> --- configure.ac | 5 +---- src/gallium/targets/gbm/Makefile.am | 2 +- src/gallium/targets/opencl/Makefile.am | 2 +- src/gallium/targets/xa/Makefile.am | 2 +- src/gallium/tests/trivial/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index e949b1d..76a1dd5 100644 --- a/configure.ac +++ b/configure.ac @@ -1924,9 +1924,7 @@ AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_I915" = xyes - if test "x$enable_gallium_loader" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null" - if test "x$enable_gallium_xlib_loader" = xyes; then - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib" - NEED_WINSYS_XLIB="yes" + if test "x$NEED_WINSYS_XLIB" = xyes; then GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" fi @@ -1952,7 +1950,6 @@ if test "x$enable_gallium_loader" = xyes; then AC_SUBST([GALLIUM_PIPE_LOADER_CLIENT_DEFINES]) AC_SUBST([GALLIUM_PIPE_LOADER_CLIENT_LIBS]) fi -AM_CONDITIONAL(NEED_PIPE_LOADER_XLIB, test "x$enable_gallium_xlib_loader" = xyes) AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes) AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes) diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index b659ac4..5a37b65 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -56,7 +56,7 @@ gbm_gallium_drm_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB gbm_gallium_drm_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index aae31ff..57092fb 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -37,7 +37,7 @@ lib@OPENCL_LIBNAME@_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB lib@OPENCL_LIBNAME@_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 3c0caf9..9b5220a 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -53,7 +53,7 @@ libxatracker_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB libxatracker_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am index 9381429..3c26cd3 100644 --- a/src/gallium/tests/trivial/Makefile.am +++ b/src/gallium/tests/trivial/Makefile.am @@ -18,7 +18,7 @@ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(GALLIUM_COMMON_LIB_DEPS) -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB LDADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ -- 1.9.1 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
