[vlc-devel] commit: XCB/GLX: we don't need GL Utilities, only GLX ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 12 20:43:28 2009 +0200| [bbcfc7feb0b56a7512ee300b240d675ec55712d5] | committer: Rémi Denis-Courmont 

XCB/GLX: we don't need GL Utilities, only GLX

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bbcfc7feb0b56a7512ee300b240d675ec55712d5
---

 configure.ac                    |    2 +-
 modules/video_output/Modules.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f1319b..ade1839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3684,7 +3684,7 @@ AC_ARG_ENABLE(glx,
 ])
 AS_IF([test "${enable_glx}" != "no"], [
   PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb])
-  PKG_CHECK_MODULES(GLU, [glu])
+  PKG_CHECK_MODULES(GL, [gl])
 
   VLC_ADD_PLUGIN([xcb_glx])
 ])
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 9a2d8b4..1b5fefa 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -48,9 +48,9 @@ libxcb_glx_plugin_la_SOURCES = \
 	xcb/glx.c \
 	xcb/events.c
 libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XLIB_XCB_CFLAGS) $(GLU_CFLAGS)
+	$(XLIB_XCB_CFLAGS) $(GL_CFLAGS)
 libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XLIB_XCB_LIBS) $(GLU_LIBS)
+	$(XLIB_XCB_LIBS) $(GL_LIBS)
 libxcb_glx_plugin_la_DEPENDENCIES =
 
 libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c