From f998479792e4a9bacfe4df5723869c0dc1b39ce6 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 17 May 2007 21:13:41 +0000
Subject: Merge internal and external VIDIX checks.

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

diff --git a/configure b/configure
index e35c5d97e1..7449e8e384 100755
--- a/configure
+++ b/configure
@@ -7203,20 +7203,18 @@ _def_linux='#undef TARGET_LINUX'
 linux && _def_linux='#define TARGET_LINUX 1'
 
 # TODO cleanup the VIDIX stuff here
-echocheck "VIDIX (internal)"
-echores "$_vidix_internal"
-
-echocheck "VIDIX (external)"
-if test "$_vidix_external" = auto; then
+echocheck "VIDIX"
+if test "$_vidix_internal" = yes; then
+  _res_comment="internal"
+  _vidix_external=no
+elif test "$_vidix_external" = auto; then
  _vidix_external=no
  cat > $TMPC <<EOF
 #include <vidix/vidix.h>
 int main(void) { return 0; }
 EOF
-  cc_check -lvidix && _vidix_external=yes
+  cc_check -lvidix && _vidix_external=yes && _res_comment="external"
 fi
-echores "$_vidix_external"
-
 if test "$_vidix_internal" = yes || test "$_vidix_external" = yes ; then
   _vidix=yes
   _def_vidix='#define CONFIG_VIDIX 1'
@@ -7224,6 +7222,7 @@ else
   _vidix=no
   _def_vidix='#undef CONFIG_VIDIX'
 fi
+echores "$_vidix"
 
 if test "$_vidix" = yes ; then
   if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e cyberblade`; then
-- 
cgit v1.2.3