[MPlayer-cvslog] CVS: main configure,1.1184,1.1185

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

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

Modified Files:
	configure 
Log Message:
check for XviD compiled with pthread support


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1184
retrieving revision 1.1185
diff -u -r1.1184 -r1.1185
--- configure	30 Apr 2006 21:17:30 -0000	1.1184
+++ configure	4 May 2006 16:34:05 -0000	1.1185
@@ -6388,7 +6388,16 @@
 #include <xvid.h>
 int main(void) { xvid_global(0, 0, 0, 0); return 0; }
 EOF
-  if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
+  if test "$_xvid" != no ;then 
+    if cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then 
+    _xvid4=yes 
+    elif cc_check $_inc_xvid $_ld_xvid $_ld_lm $_ld_pthread ; then
+    _xvid4=yes;
+    _ld_xvid="$_ld_xvid $_ld_pthread"
+    fi
+  fi
+  
+  if test "$_xvid4" = yes ; then
     _xvid=yes
     _xvid4=yes
     _def_xvid3='#undef HAVE_XVID3'
@@ -6405,7 +6414,7 @@
 echores "$_xvid"
 
 if test "$_xvid4" = yes ; then
-  echocheck "XviD 1.1 or higher"
+  echocheck "XviD two pass plugin"
   cat > $TMPC << EOF
 #include <xvid.h>
 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }