Mesa (master): build: Link DRI drivers with dricore in case of no direct rendering

[Matt Turner]

Module: Mesa
Branch: master
Commit: bee2edbf3d2da2c2351c70e56da0dca205caa8ea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bee2edbf3d2da2c2351c70e56da0dca205caa8ea

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Aug 17 16:24:32 2012 -0700

build: Link DRI drivers with dricore in case of no direct rendering

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 configure.ac |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 306188b..224caea 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])