[MPlayer-cvslog] CVS: main configure,1.1123,1.1124

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4627

Modified Files:
	configure 
Log Message:
Implement XvMC lib autodetection for future use (currently disabled, but working
if you set it xvmc=auto) and make the configure display the name of the lib it
finds. Approved by iive.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1123
retrieving revision 1.1124
diff -u -r1.1123 -r1.1124
--- configure	14 Jan 2006 23:39:31 -0000	1.1123
+++ configure	19 Jan 2006 22:09:20 -0000	1.1124
@@ -1450,7 +1450,6 @@
 cc_check -pipe && _pipe="-pipe" && echores "yes" || echores "no"
 
 _prefix="/usr/local"
-_xvmclib="XvMCNVIDIA"
 
 # GOTCHA: the variables below defines the default behavior for autodetection
 # and have - unless stated otherwise - at least 2 states : yes no
@@ -3738,7 +3737,9 @@
   (void) XvMCCreateContext(0,0,0,0,0,0,0);
   return 0; }
 EOF
-  cc_check $_inc_x11 -lXvMC -l$_xvmclib $_ld_xv $_ld_x11 && _xvmc=yes
+  for _ld_tmp in $_xvmclib XvMCNVIDIA XvMCW I810XvMC ; do
+    cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclib="$_ld_tmp" && break
+  done
 fi
 if test "$_xvmc" = yes ; then
   _def_xvmc='#define HAVE_XVMC 1'
@@ -3749,7 +3750,7 @@
   _def_xvmc='#undef HAVE_XVMC'
   _novomodules="xvmc $_novomodules"
 fi
-echores "$_xvmc"
+echores "$_xvmc (using $_xvmclib)"
 
 
 echocheck "Xinerama"