Mesa (master): glx: link loader util lib only when building with dri3

Emil Velikov evelikov at kemper.freedesktop.org
Thu Jan 23 18:02:58 UTC 2014


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

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Wed Jan 22 00:42:30 2014 +0000

glx: link loader util lib only when building with dri3

Otherwise we pull libudev as a dependency and crash
games/programs that ship their own version of libudev.

Either way we should link the loader lib only when needed.
This fixes a regression caused by
commit eac776cf779b705cbfb8d41812f1d171fb09c76f
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sat Jan 11 02:24:43 2014 +0000

    glx: use the loader util lib

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73854
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/glx/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 54a0cc0..69a6bf9 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -100,9 +100,9 @@ libglx_la_SOURCES = \
 if HAVE_DRI3
 libglx_la_SOURCES += \
           dri3_glx.c
-endif
 
 libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+endif
 
 GL_LIBS = \
 	libglx.la \




More information about the mesa-commit mailing list