[MPlayer-cvslog] r34922 - trunk/configure
reimar
subversion at mplayerhq.hu
Fri May 18 20:34:26 CEST 2012
Author: reimar
Date: Fri May 18 20:34:26 2012
New Revision: 34922
Log:
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.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Fri May 18 20:30:35 2012 (r34921)
+++ trunk/configure Fri May 18 20:34:26 2012 (r34922)
@@ -5147,19 +5147,19 @@ int main(int argc, char *argv[]) {
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"
More information about the MPlayer-cvslog
mailing list