From 290328970638be54a9fbbd07a3067d6a089122ed Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 5 Sep 2014 14:06:22 +0100 Subject: [PATCH] configure: kill off NEED_WINSYS_WRAPPER Just drop the conditional and simplify our build. This means that it'll build every time, but it does not require any dependencies nor does it take that long to compile 200 lines of boilerplate code. Signed-off-by: Emil Velikov --- configure.ac | 2 -- src/gallium/Makefile.am | 2 -- 2 files changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index c2735c2d8e9..633dcc42eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -2115,8 +2115,6 @@ AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes) AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \ "x$HAVE_GALLIUM_R600" = xyes -o \ "x$HAVE_GALLIUM_RADEONSI" = xyes) -AM_CONDITIONAL(NEED_WINSYS_WRAPPER, test "x$HAVE_GALLIUM_I915" = xyes -o \ - "x$HAVE_GALLIUM_SVGA" = xyes) AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$NEED_WINSYS_XLIB" = xyes) AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes) AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes) diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index 32a5dc709c4..3cefb2ff6f9 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -105,9 +105,7 @@ if HAVE_EGL_PLATFORM_WAYLAND SUBDIRS += winsys/sw/wayland endif -if NEED_WINSYS_WRAPPER SUBDIRS += winsys/sw/wrapper -endif ## ## Don't forget to bundle the remaining (non autotools) winsys' -- 2.30.2