[MPlayer-cvslog] CVS: main configure, 1.1042, 1.1043 Makefile, 1.328, 1.329

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/home/alex/mplayer/main

Modified Files:
	configure Makefile 
Log Message:
use libvbe from vesautils

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -r1.1042 -r1.1043
--- configure	17 Aug 2005 23:39:19 -0000	1.1042
+++ configure	18 Aug 2005 11:26:03 -0000	1.1043
@@ -4290,23 +4290,22 @@
 
 echocheck "VESA support"
 if test "$_vesa" = auto ; then
-if x86 && linux ; then
-  _vesa=no
   cat > $TMPC << EOF
-#include <sys/io.h>
-int main(void) { return 0; }
+#include <vbe.h>
+int main(void) { vbeVersion(); return 0; }
 EOF
-  cc_check && _vesa=yes
-fi
+  _vesa=no
+  cc_check -lvbe -llrmi && _vesa=yes
 fi
 if test "$_vesa" = yes ; then
   _def_vesa='#define HAVE_VESA 1'
+  _ld_vesa="-lvbe -llrmi"
   _vosrc="$_vosrc vo_vesa.c vesa_lvo.c"
   _vomodules="vesa $_vomodules"
   echores "yes"
 else
   _def_vesa='#undef HAVE_VESA'
-  echores "no (not supported on this OS/architecture)"
+  echores "no"
   _novomodules="vesa $_novomodules"
 fi
 
@@ -7025,6 +7024,7 @@
 GIF_LIB = $_ld_gif
 SDL_LIB = $_ld_sdl
 SVGA_LIB = $_ld_svga
+VESA_LIB = $_ld_vesa
 AA_LIB = $_ld_aa
 CACA_INC = $_inc_caca
 CACA_LIB = $_ld_caca

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- Makefile	11 Aug 2005 22:30:05 -0000	1.328
+++ Makefile	18 Aug 2005 11:26:03 -0000	1.329
@@ -78,6 +78,7 @@
           $(SVGA_LIB) \
           $(DIRECTFB_LIB) \
           $(CACA_LIB) \
+	  $(VESA_LIB) \
 
 AO_LIBS = $(ARTS_LIB) \
           $(ESD_LIB) \