Change a bunch of video-output-specific preprocessor directives from a HAVE_

prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 43 insertions, 43 deletions

diff --git a/configure b/configure
index 766b9cd2e6..1ad5872042 100755
--- a/configure
+++ b/configure
@@ -3742,33 +3742,33 @@ echores "$_smbsupport"
 
 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 @@ EOF
   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 @@ echores "$_tga"
 
 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 @@ echores "$_md5sum"
 
 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 @@ echores "$_yuv4mpeg"
 
 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 @@ fi
 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 @@ echores "$_dga"
 
 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 @@ else
   _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 @@ if test "$_gl" = yes ; then
   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 @@ if test "$_mga" = auto ; then
   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 @@ if test "$_xmga" = auto ; then
   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 @@ EOF
   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 @@ fi
 # 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 @@ EOF
   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 @@ EOF
   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 @@ EOF
   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 @@ if test "$_fbdev" = auto ; then
   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 @@ EOF
   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 @@ $_def_twolame
 /* 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