Mesa (master): egl/main: remove undefined X11_LIBS automake variable
Gaetan Nadon
gnadon at kemper.freedesktop.org
Wed Oct 9 14:44:33 UTC 2013
Module: Mesa
Branch: master
Commit: e6fb7441415ba641dd712f561a322fd85c662cb3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6fb7441415ba641dd712f561a322fd85c662cb3
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sat Sep 28 14:45:47 2013 -0400
egl/main: remove undefined X11_LIBS automake variable
The EGL library has some references to x11 but it gets the link flags
from the XCB_DRI2_LIBS if and only if HAVE_EGL_PLATFORM_X11 is true.
The X11_LIBS variable was probably coming from a PKG_CHECK_MODULES (x11)
earlier in history.
If it is possible to have HAVE_EGL_DRIVER_GLX without HAVE_EGL_PLATFORM_X11
then the link flags for libX11 should be passed. However, it won't come
from X11_LIBS which is undefined.
Reported-by: Emil Velikov <emil.l.velikov at gmail.com>
Acked-by: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
src/egl/main/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 786406a..60cb600 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -105,7 +105,7 @@ endif
if HAVE_EGL_DRIVER_GLX
AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
libEGL_la_LIBADD += ../drivers/glx/libegl_glx.la
-libEGL_la_LIBADD += $(X11_LIBS) $(DLOPEN_LIBS)
+libEGL_la_LIBADD += $(DLOPEN_LIBS)
endif
if HAVE_EGL_DRIVER_DRI2
More information about the mesa-commit
mailing list