From: Gaetan Nadon Date: Sat, 28 Sep 2013 18:45:47 +0000 (-0400) Subject: egl/main: remove undefined X11_LIBS automake variable X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6fb7441415ba641dd712f561a322fd85c662cb3;p=mesa.git 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 Acked-by: Emil Velikov Signed-off-by: Gaetan Nadon --- diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am index 786406aa71a..60cb6006b50 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