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

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

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

Modified Files:
	configure 
Log Message:
x264 linking now requires explicit x11 libraries inclusion.
As side effect this fix simplifies the complicated expression.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -r1.1185 -r1.1186
--- configure	4 May 2006 16:34:05 -0000	1.1185
+++ configure	4 May 2006 19:10:16 -0000	1.1186
@@ -6452,10 +6452,17 @@
 int main(void) { x264_encoder_open((void*)0); return 0; }
 EOF
 _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
-if test "$_x264" != no && \
-( cc_check $_inc_x264 $_ld_x264 $_ld_lm || \
-( test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm )) ; \
-then
+if test "$_x264" != no ; then 
+  _x264=no
+  if cc_check $_inc_x264 $_ld_x264 $_ld_lm ; then 
+    _x264=yes
+  elif  test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm ; then
+    _x264=yes
+    _ld_x264="$_ld_x264 $_ld_x11"
+  fi
+fi
+
+if test "$_x264" = yes ; then
   _x264=yes
   _def_x264='#define HAVE_X264 1'
   _codecmodules="x264 $_codecmodules"