# HG changeset patch
# User diego
# Date 1217698691 0
# Node ID 13c920fdf7f5ba375df18f66439133f1e9ceaa79
# Parent  4864676b338f61329f3cb1f323b921ef27d637d9
Change a bunch of video-output-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.

diff -r 4864676b338f -r 13c920fdf7f5 Makefile
--- a/Makefile	Sat Aug 02 17:09:13 2008 +0000
+++ b/Makefile	Sat Aug 02 17:38:11 2008 +0000
@@ -958,10 +958,10 @@
 	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF)   -DNAME=\"k6\ \"     -DHAVE_MMX -DHAVE_3DNOW
 	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF)   -DNAME=\"k7\ \"     -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
 	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF)  -DNAME=\"sse\"      -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
-	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\"  -DHAVE_MGA -DHAVE_MMX
-	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF)  -DNAME=\"mga-k6\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW
-	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF)  -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
-	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\"  -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\"  -DCONFIG_MGA -DHAVE_MMX
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF)  -DNAME=\"mga-k6\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF)  -DNAME=\"mga-k7\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\"  -DCONFIG_MGA -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
 
 REAL_SRCS    = $(wildcard TOOLS/realcodecs/*.c)
 REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
diff -r 4864676b338f -r 13c920fdf7f5 TOOLS/fastmemcpybench.c
--- a/TOOLS/fastmemcpybench.c	Sat Aug 02 17:09:13 2008 +0000
+++ b/TOOLS/fastmemcpybench.c	Sat Aug 02 17:38:11 2008 +0000
@@ -20,7 +20,7 @@
 //#define ARR_SIZE 100000
 #define ARR_SIZE (1024*768*2)
 
-#ifdef HAVE_MGA
+#ifdef CONFIG_MGA
 
 #include "drivers/mga_vid.h"
 
@@ -98,7 +98,7 @@
   unsigned char * marr1,*marr2;
   int i;
   unsigned int t;
-#ifdef HAVE_MGA
+#ifdef CONFIG_MGA
   mga_init();
   marr1 = &frame[3];
 #else
diff -r 4864676b338f -r 13c920fdf7f5 cfg-mplayer.h
--- a/cfg-mplayer.h	Sat Aug 02 17:09:13 2008 +0000
+++ b/cfg-mplayer.h	Sat Aug 02 17:38:11 2008 +0000
@@ -145,17 +145,17 @@
 	{"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n",
 	    CONF_TYPE_PRINT, 0, 0, 0, NULL},
 
-#if defined(HAVE_FBDEV)||defined(HAVE_VESA) 
+#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
        {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
        {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
        {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
 #endif 
 
-#ifdef HAVE_FBDEV
+#ifdef CONFIG_FBDEV
 	{"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
-#ifdef HAVE_DIRECTFB
+#ifdef CONFIG_DIRECTFB
 #if DIRECTFBVERSION > 912
 	{"dfbopts", "-dfbopts has been removed. Use -vf directfb:dfbopts=... instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif
@@ -226,7 +226,7 @@
 	{"vaa_dr", "-vaa_dr has been removed, use -dr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"vaa_nodr", "-vaa_nodr has been removed, use -nodr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 
-#ifdef HAVE_AA
+#ifdef CONFIG_AA
 	// -vo aa
 	{"aa*", "-aa* has been removed. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif
diff -r 4864676b338f -r 13c920fdf7f5 configure
--- a/configure	Sat Aug 02 17:09:13 2008 +0000
+++ b/configure	Sat Aug 02 17:38:11 2008 +0000
@@ -3742,33 +3742,33 @@
 
 echocheck "tdfxfb"
 if test "$_tdfxfb" = yes ; then
-  _def_tdfxfb='#define HAVE_TDFXFB 1'
+  _def_tdfxfb='#define CONFIG_TDFXFB 1'
   _vosrc="$_vosrc vo_tdfxfb.c"
   _vomodules="tdfxfb $_vomodules"
 else
-  _def_tdfxfb='#undef HAVE_TDFXFB'
+  _def_tdfxfb='#undef CONFIG_TDFXFB'
   _novomodules="tdfxfb $_novomodules"
 fi
 echores "$_tdfxfb"
 
 echocheck "s3fb"
 if test "$_s3fb" = yes ; then
-  _def_s3fb='#define HAVE_S3FB 1'
+  _def_s3fb='#define CONFIG_S3FB 1'
   _vosrc="$_vosrc vo_s3fb.c"
   _vomodules="s3fb $_vomodules"
 else
-  _def_s3fb='#undef HAVE_S3FB'
+  _def_s3fb='#undef CONFIG_S3FB'
   _novomodules="s3fb $_novomodules"
 fi
 echores "$_s3fb"
 
 echocheck "tdfxvid"
 if test "$_tdfxvid" = yes ; then
-  _def_tdfxvid='#define HAVE_TDFX_VID 1'
+  _def_tdfxvid='#define CONFIG_TDFX_VID 1'
   _vosrc="$_vosrc vo_tdfx_vid.c"
   _vomodules="tdfx_vid $_vomodules"
 else
-  _def_tdfxvid='#undef HAVE_TDFX_VID'
+  _def_tdfxvid='#undef CONFIG_TDFX_VID'
   _novomodules="tdfx_vid $_novomodules"
 fi
 echores "$_tdfxvid"
@@ -3791,22 +3791,22 @@
   cc_check && _xvr100=yes
 fi
 if test "$_xvr100" = yes ; then
-  _def_xvr100='#define HAVE_XVR100 1'
+  _def_xvr100='#define CONFIG_XVR100 1'
   _vosrc="$_vosrc vo_xvr100.c"
   _vomodules="xvr100 $_vomodules"
 else
-  _def_tdfxvid='#undef HAVE_XVR100'
+  _def_tdfxvid='#undef CONFIG_XVR100'
   _novomodules="xvr100 $_novomodules"
 fi
 echores "$_xvr100"
 
 echocheck "tga"
 if test "$_tga" = yes ; then
-  _def_tga='#define HAVE_TGA 1'
+  _def_tga='#define CONFIG_TGA 1'
   _vosrc="$_vosrc vo_tga.c"
   _vomodules="tga $_vomodules"
 else
-  _def_tga='#undef HAVE_TGA'
+  _def_tga='#undef CONFIG_TGA'
   _novomodules="tga $_novomodules"
 fi
 echores "$_tga"
@@ -3814,11 +3814,11 @@
 
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then
-  _def_md5sum="#define HAVE_MD5SUM"
+  _def_md5sum="#define CONFIG_MD5SUM"
   _vosrc="$_vosrc vo_md5sum.c"
   _vomodules="md5sum $_vomodules"
 else
-  _def_md5sum="#undef HAVE_MD5SUM"
+  _def_md5sum="#undef CONFIG_MD5SUM"
   _novomodules="md5sum $_novomodules"
 fi
 echores "$_md5sum"
@@ -3826,11 +3826,11 @@
 
 echocheck "yuv4mpeg support"
 if test "$_yuv4mpeg" = yes; then
-  _def_yuv4mpeg="#define HAVE_YUV4MPEG"
+  _def_yuv4mpeg="#define CONFIG_YUV4MPEG"
   _vosrc="$_vosrc vo_yuv4mpeg.c"
   _vomodules="yuv4mpeg $_vomodules"
 else
-  _def_yuv4mpeg="#undef HAVE_YUV4MPEG"
+  _def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
   _novomodules="yuv4mpeg $_novomodules"
 fi
 echores "$_yuv4mpeg"
@@ -3838,11 +3838,11 @@
 
 echocheck "bl"
 if test "$_bl" = yes ; then
-  _def_bl='#define HAVE_BL 1'
+  _def_bl='#define CONFIG_BL 1'
   _vosrc="$_vosrc vo_bl.c"
   _vomodules="bl $_vomodules"
 else
-  _def_bl='#undef HAVE_BL'
+  _def_bl='#undef CONFIG_BL'
   _novomodules="bl $_novomodules"
 fi
 echores "$_bl"
@@ -3896,21 +3896,21 @@
 echores "$_directfb"
 
 if test "$_directfb" = yes ; then
-  _def_directfb='#define HAVE_DIRECTFB 1'
+  _def_directfb='#define CONFIG_DIRECTFB 1'
   _vosrc="$_vosrc vo_directfb2.c"
   _vomodules="directfb $_vomodules"
   _libs_mplayer="$_libs_mplayer -ldirectfb"
 else
-  _def_directfb='#undef HAVE_DIRECTFB'
+  _def_directfb='#undef CONFIG_DIRECTFB'
   _novomodules="directfb $_novomodules"
 fi
 if test "$_dfbmga" = yes; then
   _vosrc="$_vosrc vo_dfbmga.c"
   _vomodules="dfbmga $_vomodules"
-  _def_dfbmga='#define HAVE_DFBMGA 1'
+  _def_dfbmga='#define CONFIG_DFBMGA 1'
 else
   _novomodules="dfbmga $_novomodules"
-  _def_dfbmga='#undef HAVE_DFBMGA'
+  _def_dfbmga='#undef CONFIG_DFBMGA'
 fi
 
 
@@ -4188,11 +4188,11 @@
 
 echocheck "3dfx"
 if test "$_3dfx" = yes && test "$_dga" = yes ; then
-  _def_3dfx='#define HAVE_3DFX 1'
+  _def_3dfx='#define CONFIG_3DFX 1'
   _vosrc="$_vosrc vo_3dfx.c"
   _vomodules="3dfx $_vomodules"
 else
-  _def_3dfx='#undef HAVE_3DFX'
+  _def_3dfx='#undef CONFIG_3DFX'
   _novomodules="3dfx $_novomodules"
 fi
 echores "$_3dfx"
@@ -4237,7 +4237,7 @@
   _gl=no
 fi
 if test "$_gl" = yes ; then
-  _def_gl='#define HAVE_GL 1'
+  _def_gl='#define CONFIG_GL 1'
   _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
   if test "$_gl_win32" = yes ; then
     _def_gl_win32='#define GL_WIN32 1'
@@ -4246,7 +4246,7 @@
   fi
   _vomodules="opengl $_vomodules"
 else
-  _def_gl='#undef HAVE_GL'
+  _def_gl='#undef CONFIG_GL'
   _def_gl_win32='#undef GL_WIN32'
   _novomodules="opengl $_novomodules"
 fi
@@ -4347,11 +4347,11 @@
   test -c /dev/mga_vid && _mga=yes
 fi
 if test "$_mga" = yes ; then
-  _def_mga='#define HAVE_MGA 1'
+  _def_mga='#define CONFIG_MGA 1'
   _vosrc="$_vosrc vo_mga.c"
   _vomodules="mga $_vomodules"
 else
-  _def_mga='#undef HAVE_MGA'
+  _def_mga='#undef CONFIG_MGA'
   _novomodules="mga $_novomodules"
 fi
 echores "$_mga"
@@ -4363,11 +4363,11 @@
   test "$_x11" = yes && test "$_mga" = yes && _xmga=yes
 fi
 if test "$_xmga" = yes ; then
-  _def_xmga='#define HAVE_XMGA 1'
+  _def_xmga='#define CONFIG_XMGA 1'
   _vosrc="$_vosrc vo_xmga.c"
   _vomodules="xmga $_vomodules"
 else
-  _def_xmga='#undef HAVE_XMGA'
+  _def_xmga='#undef CONFIG_XMGA'
   _novomodules="xmga $_novomodules"
 fi
 echores "$_xmga"
@@ -4383,12 +4383,12 @@
   cc_check -lggi && _ggi=yes
 fi
 if test "$_ggi" = yes ; then
-  _def_ggi='#define HAVE_GGI 1'
+  _def_ggi='#define CONFIG_GGI 1'
   _libs_mplayer="$_libs_mplayer -lggi"
   _vosrc="$_vosrc vo_ggi.c"
   _vomodules="ggi $_vomodules"
 else
-  _def_ggi='#undef HAVE_GGI'
+  _def_ggi='#undef CONFIG_GGI'
   _novomodules="ggi $_novomodules"
 fi
 echores "$_ggi"
@@ -4406,11 +4406,11 @@
 # needed to get right output on obscure combination
 # like --disable-ggi --enable-ggiwmh
 if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then
-  _def_ggiwmh='#define HAVE_GGIWMH 1'
+  _def_ggiwmh='#define CONFIG_GGIWMH 1'
   _libs_mplayer="$_libs_mplayer -lggiwmh"
 else
   _ggiwmh=no
-  _def_ggiwmh='#undef HAVE_GGIWMH'
+  _def_ggiwmh='#undef CONFIG_GGIWMH'
 fi
 echores "$_ggiwmh"
 
@@ -4436,14 +4436,14 @@
   done
 fi
 if test "$_aa" = yes ; then
-  _def_aa='#define HAVE_AA 1'
+  _def_aa='#define CONFIG_AA 1'
   if cygwin ; then
     _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
   fi
   _vosrc="$_vosrc vo_aa.c"
   _vomodules="aa $_vomodules"
 else
-  _def_aa='#undef HAVE_AA'
+  _def_aa='#undef CONFIG_AA'
   _novomodules="aa $_novomodules"
 fi
 echores "$_aa"
@@ -4464,13 +4464,13 @@
   fi
 fi
 if test "$_caca" = yes ; then
-  _def_caca='#define HAVE_CACA 1'
+  _def_caca='#define CONFIG_CACA 1'
   _inc_extra="$_inc_extra `caca-config --cflags`"
   _libs_mplayer="$_libs_mplayer `caca-config --libs`"
   _vosrc="$_vosrc vo_caca.c"
   _vomodules="caca $_vomodules"
 else
-  _def_caca='#undef HAVE_CACA'
+  _def_caca='#undef CONFIG_CACA'
   _novomodules="caca $_novomodules"
 fi
 echores "$_caca"
@@ -4486,12 +4486,12 @@
   cc_check -lvga $_ld_lm && _svga=yes
 fi
 if test "$_svga" = yes ; then
-  _def_svga='#define HAVE_SVGALIB 1'
+  _def_svga='#define CONFIG_SVGALIB 1'
   _libs_mplayer="$_libs_mplayer -lvga"
   _vosrc="$_vosrc vo_svga.c"
   _vomodules="svga $_vomodules"
 else
-  _def_svga='#undef HAVE_SVGALIB'
+  _def_svga='#undef CONFIG_SVGALIB'
   _novomodules="svga $_novomodules"
 fi
 echores "$_svga"
@@ -4503,11 +4503,11 @@
   linux && _fbdev=yes
 fi
 if test "$_fbdev" = yes ; then
-  _def_fbdev='#define HAVE_FBDEV 1'
+  _def_fbdev='#define CONFIG_FBDEV 1'
   _vosrc="$_vosrc vo_fbdev.c vo_fbdev2.c"
   _vomodules="fbdev $_vomodules"
 else
-  _def_fbdev='#undef HAVE_FBDEV'
+  _def_fbdev='#undef CONFIG_FBDEV'
   _novomodules="fbdev $_novomodules"
 fi
 echores "$_fbdev"
@@ -4770,12 +4770,12 @@
   cc_check -lvbe -llrmi && _vesa=yes
 fi
 if test "$_vesa" = yes ; then
-  _def_vesa='#define HAVE_VESA 1'
+  _def_vesa='#define CONFIG_VESA 1'
   _libs_mplayer="$_libs_mplayer -lvbe -llrmi"
   _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c"
   _vomodules="vesa $_vomodules"
 else
-  _def_vesa='#undef HAVE_VESA'
+  _def_vesa='#undef CONFIG_VESA'
   _novomodules="vesa $_novomodules"
 fi
 echores "$_vesa"
@@ -8687,7 +8687,7 @@
 /* used by GUI: */
 $_def_xshape
 
-#if defined(HAVE_GL) || defined(HAVE_X11) || defined(HAVE_XV)
+#if defined(CONFIG_GL) || defined(HAVE_X11) || defined(HAVE_XV)
 #define X11_FULLSCREEN 1
 #endif
 
diff -r 4864676b338f -r 13c920fdf7f5 libvo/video_out.c
--- a/libvo/video_out.c	Sat Aug 02 17:09:13 2008 +0000
+++ b/libvo/video_out.c	Sat Aug 02 17:38:11 2008 +0000
@@ -115,13 +115,13 @@
 
 const vo_functions_t* const video_out_drivers[] =
 {
-#ifdef HAVE_XVR100
+#ifdef CONFIG_XVR100
         &video_out_xvr100,
 #endif
-#ifdef HAVE_TDFX_VID
+#ifdef CONFIG_TDFX_VID
         &video_out_tdfx_vid,
 #endif
-#ifdef HAVE_DIRECTX
+#ifdef CONFIG_DIRECTX
         &video_out_directx,
 #endif
 #ifdef HAVE_COREVIDEO
@@ -130,19 +130,19 @@
 #ifdef HAVE_QUARTZ
 	&video_out_quartz,
 #endif
-#ifdef HAVE_XMGA
+#ifdef CONFIG_XMGA
         &video_out_xmga,
 #endif
-#ifdef HAVE_MGA
+#ifdef CONFIG_MGA
         &video_out_mga,
 #endif
-#ifdef HAVE_TDFXFB
+#ifdef CONFIG_TDFXFB
         &video_out_tdfxfb,
 #endif
-#ifdef HAVE_S3FB
+#ifdef CONFIG_S3FB
         &video_out_s3fb,
 #endif
-#ifdef HAVE_3DFX
+#ifdef CONFIG_3DFX
         &video_out_3dfx,
 #endif
 #ifdef HAVE_XV
@@ -152,30 +152,30 @@
         &video_out_x11,
         &video_out_xover,
 #endif
-#ifdef HAVE_GL
+#ifdef CONFIG_GL
 	        &video_out_gl,
         &video_out_gl2,
 #endif
 #ifdef HAVE_DGA
         &video_out_dga,
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
         &video_out_sdl,
 #endif
-#ifdef HAVE_GGI
+#ifdef CONFIG_GGI
 	&video_out_ggi,
 #endif
-#ifdef HAVE_FBDEV
+#ifdef CONFIG_FBDEV
 	&video_out_fbdev,
 	&video_out_fbdev2,
 #endif
-#ifdef HAVE_SVGALIB
+#ifdef CONFIG_SVGALIB
 	&video_out_svga,
 #endif
-#ifdef HAVE_AA
+#ifdef CONFIG_AA
 	&video_out_aa,
 #endif
-#ifdef HAVE_CACA
+#ifdef CONFIG_CACA
 	&video_out_caca,
 #endif
 #ifdef HAVE_DXR2
@@ -194,16 +194,16 @@
 	&video_out_zr,
 	&video_out_zr2,
 #endif
-#ifdef HAVE_BL
+#ifdef CONFIG_BL
 	&video_out_bl,
 #endif
-#ifdef HAVE_VESA
+#ifdef CONFIG_VESA
 	&video_out_vesa,
 #endif
-#ifdef HAVE_DIRECTFB
+#ifdef CONFIG_DIRECTFB
 	&video_out_directfb,
 #endif
-#ifdef HAVE_DFBMGA
+#ifdef CONFIG_DFBMGA
         &video_out_dfbmga,
 #endif
 #ifdef CONFIG_VIDIX
@@ -221,7 +221,7 @@
         &video_out_xvmc,
 #endif
 	&video_out_mpegpes,
-#ifdef HAVE_YUV4MPEG
+#ifdef CONFIG_YUV4MPEG
 	&video_out_yuv4mpeg,
 #endif
 #ifdef HAVE_PNG
@@ -233,13 +233,13 @@
 #ifdef HAVE_GIF
 	&video_out_gif89a,
 #endif
-#ifdef HAVE_TGA
+#ifdef CONFIG_TGA
         &video_out_tga,
 #endif
 #ifdef HAVE_PNM
     &video_out_pnm,
 #endif
-#ifdef HAVE_MD5SUM
+#ifdef CONFIG_MD5SUM
     &video_out_md5sum,
 #endif
         NULL
@@ -320,7 +320,7 @@
   return vo->config(width, height, d_width, d_height, flags, title, format);
 }
 
-#if defined(HAVE_FBDEV)||defined(HAVE_VESA)  
+#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
 /* Borrowed from vo_fbdev.c 
 Monitor ranges related functions*/
 
diff -r 4864676b338f -r 13c920fdf7f5 libvo/video_out.h
--- a/libvo/video_out.h	Sat Aug 02 17:09:13 2008 +0000
+++ b/libvo/video_out.h	Sat Aug 02 17:38:11 2008 +0000
@@ -239,7 +239,7 @@
 
 extern int WinID;
 
-#if defined(HAVE_FBDEV) || defined(HAVE_VESA)
+#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
 
 typedef struct {
         float min;
@@ -253,6 +253,6 @@
 extern char *monitor_vfreq_str;
 extern char *monitor_dotclock_str;
 
-#endif /* defined(HAVE_FBDEV) || defined(HAVE_VESA) */
+#endif /* defined(CONFIG_FBDEV) || defined(CONFIG_VESA) */
 
 #endif /* MPLAYER_VIDEO_OUT_H */
diff -r 4864676b338f -r 13c920fdf7f5 libvo/vo_ggi.c
--- a/libvo/vo_ggi.c	Sat Aug 02 17:09:13 2008 +0000
+++ b/libvo/vo_ggi.c	Sat Aug 02 17:38:11 2008 +0000
@@ -29,7 +29,7 @@
 
 #include <ggi/ggi.h>
 
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
 #include <ggi/wmh.h>
 #endif
 
@@ -70,7 +70,7 @@
 } ggi_conf;
 
 
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
 static void window_ontop(void)
 {
     mp_msg(MSGT_VO, MSGL_V, "[ggi] debug: window_ontop() called\n");
@@ -161,7 +161,7 @@
 #endif
 
 
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
     ggiWmhSetTitle(ggi_conf.vis, title);
     if (vo_ontop) window_ontop();
 #endif
@@ -395,7 +395,7 @@
         mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n");
         return -1;
     }
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
     if (ggiWmhInit() < 0) {
         mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n");
         return -1;
@@ -424,7 +424,7 @@
     ggi_conf.drawvis = ggi_conf.vis;
 
 
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
     ggiWmhAttach(ggi_conf.vis);
 #endif
 
@@ -440,7 +440,7 @@
     if (ggi_conf.driver)
         free(ggi_conf.driver);
 
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
     ggiWmhDetach(ggi_conf.vis);
     ggiWmhExit();
 #endif
@@ -459,7 +459,7 @@
         return query_format(*((uint32_t *) data));
     case VOCTRL_GET_IMAGE:
         return get_image(data);
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
     case VOCTRL_ONTOP:
         vo_ontop = (!(vo_ontop));
         window_ontop();