From 0913763c6d911faa4fd758782dc7d04d122ae821 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 21 Aug 2006 16:24:16 +0000
Subject: Properly disable tests that depend on X.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19478 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index af0e118115..543944e1b5 100755
--- a/configure
+++ b/configure
@@ -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
-- 
cgit v1.2.3