[MPlayer-cvslog] CVS: main configure,1.955,1.956

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	configure 
Log Message:
Make configure check for aalib dependency on libX11 if it fails without.
Necessary to link against aalib from the OpenBSD ports tree.
patch by Ian Lindsay <iml at formicary dot org>


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -r1.955 -r1.956
--- configure	21 Jan 2005 21:32:15 -0000	1.955
+++ configure	22 Jan 2005 14:09:17 -0000	1.956
@@ -3720,14 +3720,18 @@
 int main(void) { (void) aa_init(0, 0, 0); return 0; }
 EOF
   _aa=no
-  cc_check  -laa && _aa=yes
+  if cc_check -laa ; then
+    _aa=yes
+    _ld_aa="-laa"
+  elif cc_check $_ld_x11 -laa ; then
+    _aa=yes
+    _ld_aa="$_ld_x11 -laa"
+  fi
 fi
 if test "$_aa" = yes ; then
   _def_aa='#define HAVE_AA 1'
   if cygwin ; then
     _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
-  else
-    _ld_aa='-laa'
   fi
   _vosrc="$_vosrc vo_aa.c"
   _vomodules="aa $_vomodules"