From cf8daf54a244b3db74a7225c99529bbf78cf0ad2 Mon Sep 17 00:00:00 2001
From: iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 19 Aug 2006 19:10:27 +0000
Subject: [PATCH] Fix xv and xinerama force on --enable-* The previous commit
 changed the conditions of check execution to match Diego's semantics (execute
 check only on 'auto'), but the 'else' case forces detection to 'no', even if
 previous --enable-* had set it to 'yes'.

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

diff --git a/configure b/configure
index 9accd3c2d3..cbb6da6a12 100755
--- a/configure
+++ b/configure
@@ -3825,15 +3825,15 @@ int main(void) {
 EOF
   _xv=no
   cc_check -lXv $_ld_x11 && _xv=yes
-else
-  _xv=no
 fi
+
 if test "$_xv" = yes ; then
   _def_xv='#define HAVE_XV 1'
   _ld_xv='-lXv'
   _vosrc="$_vosrc vo_xv.c"
   _vomodules="xv $_vomodules"
 else
+  _xv=no
   _def_xv='#undef HAVE_XV'
   _novomodules="xv $_novomodules"
 fi
@@ -3878,13 +3878,13 @@ int main(void) { (void) XineramaIsActive(0); return 0; }
 EOF
   _xinerama=no
   cc_check -lXinerama $_ld_x11 && _xinerama=yes
-else
-  _xinerama=no
 fi
+
 if test "$_xinerama" = yes ; then
   _def_xinerama='#define HAVE_XINERAMA 1'
   _ld_xinerama='-lXinerama'
 else
+  _xinerama=no
   _def_xinerama='#undef HAVE_XINERAMA'
 fi
 echores "$_xinerama"