mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Properly disable tests that depend on X.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19478 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-08-21 16:24:16 +00:00
parent 45da896cd3
commit 0913763c6d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -3770,6 +3770,8 @@ else
_ld_x11=''
_novomodules="x11 $_novomodules"
_res_comment="check if the dev(el) packages are installed"
# disable stuff that depends on X
_xv=no ; _xvmc=no ; _xinerama=no ; _vm=no ; _xf86keysym=no ; _dga=no
fi
echores "$_x11"
@ -3814,7 +3816,7 @@ fi
echocheck "Xv"
if test "$_x11" = yes && test "$_xv" = auto ; then
if test "$_xv" = auto ; then
cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/Xvlib.h>
@ -3840,7 +3842,7 @@ echores "$_xv"
echocheck "XvMC"
if test "$_x11" = yes && test "$_xv" = yes && test "$_xvmc" != no ; then
if test "$_xv" = yes && test "$_xvmc" != no ; then
_xvmc=no
cat > $TMPC <<EOF
#include <X11/Xlib.h>
@ -3869,7 +3871,7 @@ echores "$_xvmc"
echocheck "Xinerama"
if test "$_x11" = yes && test "$_xinerama" = auto ; then
if test "$_xinerama" = auto ; then
cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>
@ -3894,7 +3896,7 @@ echores "$_xinerama"
# This check may be useful for future mplayer versions (to change resolution)
# If you run into problems, remove '-lXxf86vm'.
echocheck "Xxf86vm"
if test "$_x11" = yes && test "$_vm" = auto ; then
if test "$_vm" = auto ; then
cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
@ -3918,14 +3920,12 @@ echores "$_vm"
echocheck "XF86keysym"
if test "$_xf86keysym" = auto; then
_xf86keysym=no
if test "$_x11" = yes ; then
cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/XF86keysym.h>
int main(void) { return XF86XK_AudioPause; }
EOF
cc_check $_ld_x11 && _xf86keysym=yes
fi
fi
if test "$_xf86keysym" = yes ; then
_def_xf86keysym='#define HAVE_XF86XK 1'
@ -3935,9 +3935,6 @@ fi
echores "$_xf86keysym"
echocheck "DGA"
if test "$_x11" = no ; then
_dga=no
fi
# Version 2 is preferred to version 1 if available
if test "$_dga" = auto ; then
cat > $TMPC << EOF