From: Matt Turner Date: Fri, 17 Aug 2012 23:24:32 +0000 (-0700) Subject: build: Link DRI drivers with dricore in case of no direct rendering X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bee2edbf3d2da2c2351c70e56da0dca205caa8ea;p=mesa.git build: Link DRI drivers with dricore in case of no direct rendering Reviewed-by: Kenneth Graunke --- diff --git a/configure.ac b/configure.ac index 306188b9b0f..224caeafa09 100644 --- a/configure.ac +++ b/configure.ac @@ -916,17 +916,10 @@ GLAPI_LIB_DEPS="-lpthread $SELINUX_LIBS" AC_SUBST([GLAPI_LIB_DEPS]) -dnl dri libraries are linking with mesa -DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.la' -GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a' +DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" +GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so" -dnl ... or dricore? -if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then - DRI_LIB_DEPS="\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la" - GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so" - HAVE_DRICORE=yes -fi -AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes) +AM_CONDITIONAL(HAVE_DRICORE, test "x$enable_dri" = xyes) AC_SUBST([HAVE_XF86VIDMODE])