Mercurial > mplayer.hg

changeset 34834:2292b00862af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only try to build vo gl with X11/win32 backends if these were detected. Fixes compilation with --disable-x11 or when X11 headers are available but not the libraries.
author reimar
date Fri, 18 May 2012 18:34:26 +0000
parents 1e764ecad726
children d59e91d7e4b4
files configure
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri May 18 18:30:35 2012 +0000
+++ b/configure	Fri May 18 18:34:26 2012 +0000
@@ -5147,19 +5147,19 @@
 EOF
   _gl=no
   for ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $ld_pthread" ; do
-    if cc_check $ld_tmp ; then
+    if test "$_x11" = yes && cc_check $ld_tmp ; then
       _gl=yes
       _gl_x11=yes
       libs_mplayer="$libs_mplayer $ld_tmp $ld_dl"
       break
     fi
   done
-  if cc_check -DGL_EGL_X11 -lEGL ; then
+  if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
     _gl=yes
     _gl_egl_x11=yes
     libs_mplayer="$libs_mplayer -lEGL $ld_dl"
   fi
-  if cc_check -DGL_WIN32 -lopengl32 ; then
+  if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
     _gl=yes
     _gl_win32=yes
     libs_mplayer="$libs_mplayer -lopengl32 -lgdi32"