[vlc-devel] commit: Fallback if gl.pc is missing (not tested) ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Dec 12 19:56:00 CET 2009


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

Fallback if gl.pc is missing (not tested)

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

 configure.ac |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ade1839..566a0e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3684,10 +3684,18 @@ AC_ARG_ENABLE(glx,
 ])
 AS_IF([test "${enable_glx}" != "no"], [
   PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb])
-  PKG_CHECK_MODULES(GL, [gl])
-
+  PKG_CHECK_MODULES(GL, [gl],, [
+    AC_CHECK_HEADER([GL/gl.h], [
+      GL_CFLAGS=""
+      GL_LIBS="-lGL"
+    ], [
+      AC_MSG_ERROR([GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx.])
+    ])
+  ])
   VLC_ADD_PLUGIN([xcb_glx])
 ])
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
 
 
 dnl




More information about the vlc-devel mailing list