[Mplayer-cvslog] CVS: main configure, 1.844, 1.845 Makefile, 1.283, 1.284

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

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

Modified Files:
	configure Makefile 
Log Message:
libcaca video output driver by Howell Tam

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- configure	5 Apr 2004 23:17:40 -0000	1.844
+++ configure	6 Apr 2004 00:04:48 -0000	1.845
@@ -222,6 +222,7 @@
   --enable-svga          build with SVGAlib support [autodetect]
   --enable-sdl           build with SDL render support [autodetect]
   --enable-aa            build with AAlib render support [autodetect]
+  --enable-caca          build with CACA render support [autodetect]
   --enable-ggi           build with GGI render support [autodetect]
   --enable-directx       build with DirectX support [autodetect]
   --enable-dxr2          build with DXR2 render support [autodetect]
@@ -1137,6 +1138,7 @@
 _gl=auto
 _ggi=auto
 _aa=auto
+_caca=auto
 _svga=auto
 _vesa=auto
 _fbdev=auto
@@ -1283,6 +1285,8 @@
   --disable-ggi)	_ggi=no		;;
   --enable-aa)		_aa=yes		;;
   --disable-aa)		_aa=no		;;
+  --enable-caca)	_caca=yes	;;
+  --disable-caca)	_caca=no	;;
   --enable-svga)	_svga=yes	;;
   --disable-svga)	_svga=no	;;
   --enable-vesa)	_vesa=yes	;;
@@ -3293,6 +3297,26 @@
 fi
 echores "$_aa"
 
+echocheck "CACA"
+if test "$_caca" = auto ; then
+  cat > $TMPC << EOF
+#include <caca.h>
+int main(void) { (void) caca_init(); return 0; }
+EOF
+  _caca=no
+  cc_check `caca-config --libs` && _caca=yes
+fi
+if test "$_caca" = yes ; then
+  _def_caca='#define HAVE_CACA 1'
+  _ld_caca=`caca-config --libs`
+  _vosrc="$_vosrc vo_caca.c"
+  _vomodules="caca $_vomodules"
+else
+  _def_caca='#undef HAVE_CACA'
+  _novomodules="caca $_novomodules"
+fi
+echores "$_caca"
+
 
 echocheck "SVGAlib"
 if test "$_svga" = auto ; then
@@ -5901,6 +5925,7 @@
 SDL_LIB = $_ld_sdl
 SVGA_LIB = $_ld_svga
 AA_LIB = $_ld_aa
+CACA_LIB = $_ld_caca
 
 # audio output
 ALSA_LIB = $_ld_alsa
@@ -6534,6 +6559,7 @@
 $_def_vesa
 $_def_xdpms
 $_def_aa
+$_def_caca
 $_def_tga
 
 /* used by GUI: */

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- Makefile	5 Apr 2004 22:49:28 -0000	1.283
+++ Makefile	6 Apr 2004 00:04:48 -0000	1.284
@@ -32,7 +32,7 @@
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
+VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB)
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB)