Mesa (master): Make sure libGL.so links with libglsl

[Matt Turner]

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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Jan 31 11:54:24 2012 -0500

Make sure libGL.so links with libglsl

Can't link against *.la files if we're not using libtool to link.

Fixes undefined symbol: _ZN23ir_hierarchical_visitor5visitEP11ir_variable

---

 configure.ac         |    2 ++
 src/mesa/sources.mak |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8af2456..0e03af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,6 +401,7 @@ GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
 GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
 VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
 GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}
+GLSL_LIB_NAME='libglsl.'${LIB_EXTENSION}
 
 GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
 GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
@@ -420,6 +421,7 @@ AC_SUBST([GLESv1_CM_LIB_NAME])
 AC_SUBST([GLESv2_LIB_NAME])
 AC_SUBST([VG_LIB_NAME])
 AC_SUBST([GLAPI_LIB_NAME])
+AC_SUBST([GLSL_LIB_NAME])
 
 AC_SUBST([GL_LIB_GLOB])
 AC_SUBST([GLU_LIB_GLOB])
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 0768890..aadbf41 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -368,7 +368,7 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 ### Other archives/libraries
 
 GLSL_LIBS = \
-	$(TOP)/src/glsl/libglsl.la
+	$(TOP)/src/glsl/.libs/$(GLSL_LIB_NAME)
 
 
 ### Include directories