Skip to content

V
vlc
Commit d8941c49 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

configure.ac: More strict test fot GL stuff

parent cc8fa0d2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
configure.ac
View file @ d8941c49
...@@ -3483,12 +3483,11 @@ if test "${enable_glx}" != "no" && ...@@ -3483,12 +3483,11 @@ if test "${enable_glx}" != "no" &&
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_glx}" = "yes"); then test "${enable_glx}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AC_CHECK_HEADERS(X11/Xlib.h, [ AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h, [
AC_CHECK_HEADERS(GL/glx.h, [
VLC_ADD_PLUGINS([glx]) VLC_ADD_PLUGINS([glx])
VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
]) ]) ])
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
fi fi
...@@ -4798,7 +4797,7 @@ AC_ARG_ENABLE(galaktos, ...@@ -4798,7 +4797,7 @@ AC_ARG_ENABLE(galaktos,
[ --enable-galaktos OpenGL visualisation plugin (default disabled)]) [ --enable-galaktos OpenGL visualisation plugin (default disabled)])
if test "${enable_galaktos}" = "yes" if test "${enable_galaktos}" = "yes"
then then
AC_CHECK_HEADERS(GL/gl.h, [ AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
VLC_ADD_PLUGINS([galaktos]) VLC_ADD_PLUGINS([galaktos])
if test "${SYS}" != "mingw32"; then if test "${SYS}" != "mingw32"; then
VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU]) VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment