Mesa (master): Don't build shared dricore when unneeded

[Jon TURNEY]

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

Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sun Jan 22 14:21:56 2012 +0000

Don't build shared dricore when unneeded

Refine "always build shared dricore" so we don't build it if we don't need
it because we aren't actually building any dri drivers because of --disable-driglx-direct

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9599568..c76af5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1060,7 +1060,7 @@ DRI_CXXFLAGS='$(CXXFLAGS)'
 DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
 MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
 
-if test "x$enable_dri" = xyes ; then
+if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
     DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
     DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
     DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'