diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-03-16 12:55:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-03-19 11:13:06 -0400 |
| commit | ca760181b4420696c7e86aa2951d7203522ad1e8 (patch) | |
| tree | 88e11d719bbd0963594645ab4d16c9c051b8eace /src/glx | |
| parent | 91ddfa72b4384d04e4d84e60b4cdf3efee7ef49b (diff) | |
| download | external_mesa3d-ca760181b4420696c7e86aa2951d7203522ad1e8.zip external_mesa3d-ca760181b4420696c7e86aa2951d7203522ad1e8.tar.gz external_mesa3d-ca760181b4420696c7e86aa2951d7203522ad1e8.tar.bz2 | |
shared-glapi: Convert to automake
This fixes a build problem where EGL links to libgbm.la, which encodes
a relative path to it's libglapi.so dependency. The relative path
breaks when the linker tries to resolve it from src/egl/main instead
of src/gbm. Typically we silently fall back to the system
libglapi.so, which is wrong and breaks when there isn't one.
Morale of the story: don't mix mklib and libtool.
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 79dc405..a11bd3f 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -21,7 +21,7 @@ if HAVE_SHARED_GLAPI SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI -SHARED_GLAPI_LIBS = -L$(top_builddir)/$(LIB_DIR) -lglapi +SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif GLAPI_LIB = ../mapi/glapi/libglapi.a |