[MPlayer-cvslog] r23332 - trunk/configure

[diego]

Author: diego
Date: Thu May 17 23:13:41 2007
New Revision: 23332

Log:
Merge internal and external VIDIX checks.


Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu May 17 23:13:41 2007
@@ -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