diff options
| author | Matt Turner <[email protected]> | 2012-08-17 16:24:32 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-08-22 11:08:06 -0700 |
| commit | bee2edbf3d2da2c2351c70e56da0dca205caa8ea (patch) | |
| tree | 0378a273e8a6f8c63c67f8a122185fe0c618fc11 | |
| parent | bfd7d6f58b47984853cf0831057e84a617de25ed (diff) | |
build: Link DRI drivers with dricore in case of no direct rendering
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 3 insertions, 10 deletions
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]) |