Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>tags/rgb10_a2ui-v3
@@ -147,7 +147,6 @@ VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@ | |||
GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@ | |||
# DRI dependencies | |||
MESA_MODULES = @MESA_MODULES@ | |||
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@ | |||
LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ | |||
LIBDRM_LIB = @LIBDRM_LIBS@ |
@@ -1067,15 +1067,12 @@ AC_SUBST([GLAPI_LIB_DEPS]) | |||
dnl Setup default DRI CFLAGS | |||
DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a' | |||
MESA_MODULES='$(TOP)/src/mesa/libmesa.a' | |||
if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then | |||
DRI_LIB_DEPS="-L\$(TOP)/\$(LIB_DIR) -ldricore$VERSION" | |||
MESA_MODULES="\$(TOP)/\$(LIB_DIR)/libdricore$VERSION.so" | |||
HAVE_DRICORE=yes | |||
fi | |||
AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes) | |||
AC_SUBST([MESA_MODULES]) | |||
AC_SUBST([HAVE_XF86VIDMODE]) | |||