[MPlayer-cvslog] CVS: main configure,1.1028,1.1029

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

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

Modified Files:
	configure 
Log Message:
libx264 compiled with visualization requirs xlib


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1028
retrieving revision 1.1029
diff -u -r1.1028 -r1.1029
--- configure	10 Jul 2005 17:14:10 -0000	1.1028
+++ configure	19 Jul 2005 16:47:25 -0000	1.1029
@@ -6137,7 +6137,10 @@
 int main(void) { x264_encoder_open((void*)0); return 0; }
 EOF
 _ld_x264="$_ld_x264 -lx264 $_ld_lm $_ld_pthread"
-if test "$_x264" != no && cc_check $_inc_x264 $_ld_x264 ; then
+if test "$_x264" != no && \
+( cc_check $_inc_x264 $_ld_x264 || \
+( test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 )) ; \
+then
   _x264=yes
   _def_x264='#define HAVE_X264 1'
   _codecmodules="x264 $_codecmodules"