Change a bunch of video/audio-output-specific preprocessor directives from

a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2025-04-01 00:07:33 +00:00 · 2008-08-03 15:21:40 +00:00 · 2008-08-03 15:21:40 +00:00 · 02135001b4
commit 02135001b4
parent 52d358e3dc
61 changed files with 240 additions and 239 deletions
--- a/2
+++ b/2
@ -741,7 +741,7 @@ checkheaders: $(ALLHEADERS:.h=.ho)
 dep depend: $(DEPS)
 	for part in $(PARTS); do $(MAKE) -C $$part depend; done

-$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h
+$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h #config.h
 	$(MAKE) -C $(@D)
 	touch $@

--- a/cfg-common-opts.h
+++ b/cfg-common-opts.h
@ -156,13 +156,13 @@
 #else
 	{"tv", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif /* CONFIG_TV */
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
 	{"pvr", pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #else
 	{"pvr", "MPlayer was compiled without V4L2/PVR interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */
 	{"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 	{"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif

--- a/cfg-common.h
+++ b/cfg-common.h
@ -90,7 +90,7 @@ const m_option_t tvopts_conf[]={
 	{"chanlist", &stream_tv_defaults.chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"norm", &stream_tv_defaults.norm, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"automute", &stream_tv_defaults.automute, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
-#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
+#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
 	{"normid", &stream_tv_defaults.normid, CONF_TYPE_INT, 0, 0, 0, NULL},
 #endif
 	{"width", &stream_tv_defaults.width, CONF_TYPE_INT, 0, 0, 4096, NULL},
@ -104,12 +104,12 @@ const m_option_t tvopts_conf[]={
 	{"hue", &stream_tv_defaults.hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 	{"saturation", &stream_tv_defaults.saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 	{"gain", &stream_tv_defaults.gain, CONF_TYPE_INT, CONF_RANGE, -1, 100, NULL},
-#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
+#if defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
 	{"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL},
 	{"amode", &stream_tv_defaults.amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
 	{"volume", &stream_tv_defaults.volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
 #endif
-#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
+#if defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2)
 	{"bass", &stream_tv_defaults.bass, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
 	{"treble", &stream_tv_defaults.treble, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
 	{"balance", &stream_tv_defaults.balance, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
@ -122,16 +122,16 @@ const m_option_t tvopts_conf[]={
 #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
 	{"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif /* defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) */
-#endif /* defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) */
+#endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */
 	{"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	{"tdevice", &stream_tv_defaults.tdevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"tpage", &stream_tv_defaults.tpage, CONF_TYPE_INT, CONF_RANGE, 100, 899, NULL},
 	{"tformat", &stream_tv_defaults.tformat, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
 	{"tlang", &stream_tv_defaults.tlang, CONF_TYPE_INT, CONF_RANGE, -1, 0x7f, NULL},
-#endif /* HAVE_TV_TELETEXT */
+#endif /* CONFIG_TV_TELETEXT */
 	{"audioid", &stream_tv_defaults.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
 	{"hidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nohidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 0, NULL},
 	{"hidden_vp_renderer", &stream_tv_defaults.hidden_vp_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@ -145,7 +145,7 @@ const m_option_t tvopts_conf[]={
 };
 #endif /* CONFIG_TV */

-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
 extern int pvr_param_aspect_ratio;
 extern int pvr_param_sample_rate;
 extern int pvr_param_audio_layer;
@ -168,9 +168,9 @@ const m_option_t pvropts_conf[]={
 	{"fmt", &pvr_param_stream_type, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */

-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
 extern const m_config_t dvbin_opts_conf[];
 #endif
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@ -231,12 +231,12 @@ const m_option_t mplayer_opts[]={
 	{"aa*", "-aa* has been removed. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif

-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
 	// -vo zr
 	{"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption },
 #endif

-#ifdef HAVE_DXR2
+#ifdef CONFIG_DXR2
 	{"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif

--- a/command.c
+++ b/command.c
@ -34,10 +34,10 @@
 #ifdef CONFIG_RADIO
 #include "stream/stream_radio.h"
 #endif
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
 #include "stream/pvr.h"
 #endif
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
 #endif
 #ifdef CONFIG_DVDREAD
@ -1860,7 +1860,7 @@ static int mp_property_tv_color(m_option_t * prop, int action, void *arg,

 #endif

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int mp_property_teletext_common(m_option_t * prop, int action, void *arg,
                  MPContext * mpctx)
 {
@ -1941,7 +1941,7 @@ static int mp_property_teletext_page(m_option_t * prop, int action, void *arg,
 }


-#endif /* HAVE_TV_TELETEXT */
+#endif /* CONFIG_TV_TELETEXT */

 ///@}

@ -2092,7 +2092,7 @@ static const m_option_t mp_properties[] = {
     M_OPT_RANGE, -100, 100, (void *) TV_COLOR_HUE },
 #endif

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    { "teletext_page", mp_property_teletext_page, CONF_TYPE_INT,
     M_OPT_RANGE, 100, 899,  (void*)TV_VBI_CONTROL_GET_PAGE },
    { "teletext_subpage", mp_property_teletext_common, CONF_TYPE_INT,
@ -2704,28 +2704,28 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 	    if (mpctx->file_format == DEMUXER_TYPE_TV)
 		tv_set_freq((tvi_handle_t *) (mpctx->demuxer->priv),
 			    cmd->args[0].v.f * 16.0);
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
            else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
              pvr_set_freq (mpctx->stream, ROUND (cmd->args[0].v.f));
              set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s",
                           pvr_get_current_channelname (mpctx->stream),
                           pvr_get_current_stationname (mpctx->stream));
            }
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */
 	    break;

 	case MP_CMD_TV_STEP_FREQ:
 	    if (mpctx->file_format == DEMUXER_TYPE_TV)
 		tv_step_freq((tvi_handle_t *) (mpctx->demuxer->priv),
 			    cmd->args[0].v.f * 16.0);
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
            else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
              pvr_force_freq_step (mpctx->stream, ROUND (cmd->args[0].v.f));
              set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: f %d",
                           pvr_get_current_channelname (mpctx->stream),
                           pvr_get_current_frequency (mpctx->stream));
            }
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */
 	    break;

 	case MP_CMD_TV_SET_NORM:
@ -2752,7 +2752,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 			//vo_osd_changed(OSDTYPE_SUBTITLE);
 		    }
 		}
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
                else if (mpctx->stream &&
                         mpctx->stream->type == STREAMTYPE_PVR) {
                  pvr_set_channel_step (mpctx->stream, cmd->args[0].v.i);
@ -2760,9 +2760,9 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
                               pvr_get_current_channelname (mpctx->stream),
                               pvr_get_current_stationname (mpctx->stream));
                }
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */
 	    }
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 	    if (mpctx->stream->type == STREAMTYPE_DVB) {
 		    int dir;
 		    int v = cmd->args[0].v.i;
@ -2777,7 +2777,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 		    if (dvb_step_channel(mpctx->stream, dir))
 			mpctx->eof = mpctx->dvbin_reopen = 1;
 	    }
-#endif				/* HAS_DVBIN_SUPPORT */
+#endif /* CONFIG_DVBIN */
 	    break;

 	case MP_CMD_TV_SET_CHANNEL:
@ -2790,17 +2790,17 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 		    //vo_osd_changed(OSDTYPE_SUBTITLE);
 		}
 	    }
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
            else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
              pvr_set_channel (mpctx->stream, cmd->args[0].v.s);
              set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s",
                           pvr_get_current_channelname (mpctx->stream),
                           pvr_get_current_stationname (mpctx->stream));
            }
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */
 	    break;

-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 	case MP_CMD_DVB_SET_CHANNEL:
 	    if (mpctx->stream->type == STREAMTYPE_DVB) {
 			mpctx->last_dvb_step = 1;
@ -2810,7 +2810,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 			mpctx->eof = mpctx->dvbin_reopen = 1;
 	    }
 	    break;
-#endif				/* HAS_DVBIN_SUPPORT     */
+#endif /* CONFIG_DVBIN */

 	case MP_CMD_TV_LAST_CHANNEL:
 	    if (mpctx->file_format == DEMUXER_TYPE_TV) {
@ -2821,14 +2821,14 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 		    //vo_osd_changed(OSDTYPE_SUBTITLE);
 		}
 	    }
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
            else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
              pvr_set_lastchannel (mpctx->stream);
              set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s",
                           pvr_get_current_channelname (mpctx->stream),
                           pvr_get_current_stationname (mpctx->stream));
            }
-#endif /* HAVE_PVR */
+#endif /* CONFIG_PVR */
 	    break;

 	case MP_CMD_TV_STEP_NORM:
@ -2840,7 +2840,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 	    if (mpctx->file_format == DEMUXER_TYPE_TV)
 		tv_step_chanlist((tvi_handle_t *) (mpctx->demuxer->priv));
 	    break;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case MP_CMD_TV_TELETEXT_ADD_DEC:
 	{
 	    tvi_handle_t* tvh=(tvi_handle_t *)(mpctx->demuxer->priv);
@ -2855,7 +2855,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
 		tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GO_LINK,&(cmd->args[0].v.i));
 	    break;
 	}
-#endif /* HAVE_TV_TELETEXT */
+#endif /* CONFIG_TV_TELETEXT */
 #endif /* CONFIG_TV */

 	case MP_CMD_SUB_LOAD:
--- a/87
+++ b/87
@ -4537,8 +4537,8 @@ EOF
 fi
 echores "$_dvb"
 if test "$_dvb" = yes ; then
-  _def_dvb='#define HAVE_DVB 1'
-  _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
+  _def_dvb='#define CONFIG_DVB 1'
+  _def_dvbin='#define CONFIG_DVBIN 1'
  _aomodules="mpegpes(dvb) $_aomodules"
  _vomodules="mpegpes(dvb) $_vomodules"
 fi
@ -4566,17 +4566,18 @@ EOF
 fi
 echores "$_dvbhead"
 if test "$_dvbhead" = yes ; then
-  _def_dvb='#define HAVE_DVB 1'
-  _def_dvb_head='#define HAVE_DVB_HEAD 1'
-  _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
+  _def_dvb='#define CONFIG_DVB 1'
+  _def_dvb_head='#define CONFIG_DVB_HEAD 1'
+  _def_dvbin='#define CONFIG_DVBIN 1'
  _aomodules="mpegpes(dvb) $_aomodules"
  _vomodules="mpegpes(dvb) $_vomodules"
 fi

 if test "$_dvbhead" = no && test "$_dvb" = no ; then
-  _def_dvb='#undef HAVE_DVB'
+  _def_dvb='#undef CONFIG_DVB'
+  _def_dvb_head='#undef CONFIG_DVB_HEAD'
  _def_dvb_head='#undef HAVE_DVB_HEAD'
-  _def_dvb_in='#undef HAS_DVBIN_SUPPORT '
+  _def_dvbin='#undef CONFIG_DVBIN '
  _aomodules="mpegpes(file) $_aomodules"
  _vomodules="mpegpes(file) $_vomodules"
 fi
@ -4821,7 +4822,7 @@ EOF
  fi
 fi
 if test "$_sdl" = yes ; then
-  _def_sdl='#define HAVE_SDL 1'
+  _def_sdl='#define CONFIG_SDL 1'
  if cygwin ; then
    _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`"
    _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`"
@ -4838,7 +4839,7 @@ if test "$_sdl" = yes ; then
  _aomodules="sdl $_aomodules"
  _res_comment="using $_sdlconfig"
 else
-  _def_sdl='#undef HAVE_SDL'
+  _def_sdl='#undef CONFIG_SDL'
  _novomodules="sdl $_novomodules"
  _noaomodules="sdl $_noaomodules"
 fi
@ -4929,13 +4930,13 @@ EOF
  done
 fi
 if test "$_dxr2" = yes; then
-  _def_dxr2='#define HAVE_DXR2 1'
+  _def_dxr2='#define CONFIG_DXR2 1'
  _vosrc="$_vosrc vo_dxr2.c"
  _aosrc="$_aosrc ao_dxr2.c"
  _aomodules="dxr2 $_aomodules"
  _vomodules="dxr2 $_vomodules"
 else
-  _def_dxr2='#undef HAVE_DXR2'
+  _def_dxr2='#undef CONFIG_DXR2'
  _noaomodules="dxr2 $_noaomodules"
  _novomodules="dxr2 $_novomodules"
 fi
@ -4951,11 +4952,11 @@ EOF
  cc_check && _dxr3=yes
 fi
 if test "$_dxr3" = yes ; then
-  _def_dxr3='#define HAVE_DXR3 1'
+  _def_dxr3='#define CONFIG_DXR3 1'
  _vosrc="$_vosrc vo_dxr3.c"
  _vomodules="dxr3 $_vomodules"
 else
-  _def_dxr3='#undef HAVE_DXR3'
+  _def_dxr3='#undef CONFIG_DXR3'
  _novomodules="dxr3 $_novomodules"
 fi
 echores "$_dxr3"
@ -4981,13 +4982,13 @@ EOF
  cc_check && _ivtv=yes
 fi
 if test "$_ivtv" = yes ; then
-  _def_ivtv='#define HAVE_IVTV 1'
+  _def_ivtv='#define CONFIG_IVTV 1'
  _vosrc="$_vosrc vo_ivtv.c"
  _vomodules="ivtv $_vomodules"
  _aosrc="$_aosrc ao_ivtv.c"
  _aomodules="ivtv $_aomodules"
 else
-  _def_ivtv='#undef HAVE_IVTV'
+  _def_ivtv='#undef CONFIG_IVTV'
  _novomodules="ivtv $_novomodules"
  _noaomodules="ivtv $_noaomodules"
 fi
@ -5016,13 +5017,13 @@ EOF
  cc_check && _v4l2=yes
 fi
 if test "$_v4l2" = yes ; then
-  _def_v4l2='#define HAVE_V4L2_DECODER 1'
+  _def_v4l2='#define CONFIG_V4L2_DECODER 1'
  _vosrc="$_vosrc vo_v4l2.c"
  _vomodules="v4l2 $_vomodules"
  _aosrc="$_aosrc ao_v4l2.c"
  _aomodules="v4l2 $_aomodules"
 else
-  _def_v4l2='#undef HAVE_V4L2_DECODER'
+  _def_v4l2='#undef CONFIG_V4L2_DECODER'
  _novomodules="v4l2 $_novomodules"
  _noaomodules="v4l2 $_noaomodules"
 fi
@ -5399,10 +5400,10 @@ fi #if irix
 echocheck "VCD support"
 if linux || freebsd || netbsd || dragonfly || bsdos || darwin || sunos || mingw32; then
  _inputmodules="vcd $_inputmodules"
-  _def_vcd='#define HAVE_VCD 1'
+  _def_vcd='#define CONFIG_VCD 1'
  _vcd="yes"
 else
-  _def_vcd='#undef HAVE_VCD'
+  _def_vcd='#undef CONFIG_VCD'
  _noinputmodules="vcd $_noinputmodules"
  _res_comment="not supported on this OS"
  _vcd="no"
@ -6796,16 +6797,16 @@ if test "$_zr" = auto ; then
 fi
 if test "$_zr" = yes ; then
  if test "$_libavcodec_a" = yes ; then
-    _def_zr='#define HAVE_ZR 1'
+    _def_zr='#define CONFIG_ZR 1'
    _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c"
    _vomodules="zr zr2 $_vomodules"
  else
    _res_comment="libavcodec (static) is required by zr, sorry"
    _novomodules="zr $_novomodules"
-    _def_zr='#undef HAVE_ZR'
+    _def_zr='#undef CONFIG_ZR'
  fi
 else
-  _def_zr='#undef HAVE_ZR'
+  _def_zr='#undef CONFIG_ZR'
  _novomodules="zr zr2 $_novomodules"
 fi
 echores "$_zr"
@ -6974,10 +6975,10 @@ EOF
    fi
  fi
  if test "$_tv_bsdbt848" = yes ; then
-    _def_tv_bsdbt848='#define HAVE_TV_BSDBT848 1'
+    _def_tv_bsdbt848='#define CONFIG_TV_BSDBT848 1'
    _inputmodules="tv-bsdbt848 $_inputmodules"
  else
-    _def_tv_bsdbt848='#undef HAVE_TV_BSDBT848'
+    _def_tv_bsdbt848='#undef CONFIG_TV_BSDBT848'
    _noinputmodules="tv-bsdbt848 $_noinputmodules"
  fi
  echores "$_tv_bsdbt848"
@ -7001,11 +7002,11 @@ EOF
 fi
 if test "$_tv_dshow" = yes ; then
  _inputmodules="tv-dshow $_inputmodules"
-  _def_tv_dshow='#define HAVE_TV_DSHOW 1'
+  _def_tv_dshow='#define CONFIG_TV_DSHOW 1'
  _ld_extra="$_ld_extra -lole32 -luuid"
 else
  _noinputmodules="tv-dshow $_noinputmodules"
-  _def_tv_dshow='#undef HAVE_TV_DSHOW'
+  _def_tv_dshow='#undef CONFIG_TV_DSHOW'
 fi
 echores "$_tv_dshow"

@ -7025,12 +7026,12 @@ fi
 if test "$_tv_v4l1" = yes ; then
  _audio_input=yes
  _tv_v4l=yes
-  _def_tv_v4l='#define HAVE_TV_V4L 1'
-  _def_tv_v4l1='#define HAVE_TV_V4L1 1'
+  _def_tv_v4l='#define CONFIG_TV_V4L 1'
+  _def_tv_v4l1='#define CONFIG_TV_V4L1 1'
  _inputmodules="tv-v4l $_inputmodules"
 else
  _noinputmodules="tv-v4l1 $_noinputmodules"
-  _def_tv_v4l='#undef HAVE_TV_V4L'
+  _def_tv_v4l='#undef CONFIG_TV_V4L'
 fi
 echores "$_tv_v4l1"

@ -7051,12 +7052,12 @@ fi
 if test "$_tv_v4l2" = yes ; then
  _audio_input=yes
  _tv_v4l=yes
-  _def_tv_v4l='#define HAVE_TV_V4L 1'
-  _def_tv_v4l2='#define HAVE_TV_V4L2 1'
+  _def_tv_v4l='#define CONFIG_TV_V4L 1'
+  _def_tv_v4l2='#define CONFIG_TV_V4L2 1'
  _inputmodules="tv-v4l2 $_inputmodules"
 else
  _noinputmodules="tv-v4l2 $_noinputmodules"
-  _def_tv_v4l2='#undef HAVE_TV_V4L2'
+  _def_tv_v4l2='#undef CONFIG_TV_V4L2'
 fi
 echores "$_tv_v4l2"

@ -7071,11 +7072,11 @@ if test "$_tv_teletext" = auto ; then
  fi
 fi
 if test "$_tv_teletext" = yes ; then
-  _def_tv_teletext='#define HAVE_TV_TELETEXT 1'
+  _def_tv_teletext='#define CONFIG_TV_TELETEXT 1'
  _inputmodules="tv-teletext $_inputmodules"
 else
  _noinputmodules="tv-teletext $_noinputmodules"
-  _def_tv_teletext='#undef HAVE_TV_TELETEXT'
+  _def_tv_teletext='#undef CONFIG_TV_TELETEXT'
 fi
 echores "$_tv_teletext"

@ -7117,9 +7118,9 @@ EOF
  fi
 fi
 if test "$_radio_v4l2" = yes ; then
-  _def_radio_v4l2='#define HAVE_RADIO_V4L2 1'
+  _def_radio_v4l2='#define CONFIG_RADIO_V4L2 1'
 else
-  _def_radio_v4l2='#undef HAVE_RADIO_V4L2'
+  _def_radio_v4l2='#undef CONFIG_RADIO_V4L2'
 fi
 echores "$_radio_v4l2"

@ -7136,9 +7137,9 @@ EOF
  fi
 fi
 if test "$_radio_v4l" = yes ; then
-  _def_radio_v4l='#define HAVE_RADIO_V4L 1'
+  _def_radio_v4l='#define CONFIG_RADIO_V4L 1'
 else
-  _def_radio_v4l='#undef HAVE_RADIO_V4L'
+  _def_radio_v4l='#undef CONFIG_RADIO_V4L'
 fi
 echores "$_radio_v4l"

@ -7159,9 +7160,9 @@ echores "$_radio_bsdbt848"
 fi #if freebsd || netbsd || openbsd || dragonfly || bsdos && _radio && _radio_bsdbt848

 if test "$_radio_bsdbt848" = yes ; then
-  _def_radio_bsdbt848='#define HAVE_RADIO_BSDBT848 1'
+  _def_radio_bsdbt848='#define CONFIG_RADIO_BSDBT848 1'
 else
-  _def_radio_bsdbt848='#undef HAVE_RADIO_BSDBT848'
+  _def_radio_bsdbt848='#undef CONFIG_RADIO_BSDBT848'
 fi

 if test "$_radio_v4l" = no && test "$_radio_v4l2" = no && \
@ -7184,11 +7185,11 @@ EOF
 fi
 fi
 if test "$_pvr" = yes ; then
-  _def_pvr='#define HAVE_PVR 1'
+  _def_pvr='#define CONFIG_PVR 1'
  _inputmodules="pvr $_inputmodules"
 else
  _noinputmodules="pvr $_noinputmodules"
-  _def_pvr='#undef HAVE_PVR'
+  _def_pvr='#undef CONFIG_PVR'
 fi
 echores "$_pvr"

@ -8676,7 +8677,7 @@ $_def_ivtv
 $_def_v4l2
 $_def_dvb
 $_def_dvb_head
-$_def_dvb_in
+$_def_dvbin
 $_def_svga
 $_def_vesa
 $_def_xss
--- a/gui/cfg.c
+++ b/gui/cfg.c
@ -63,7 +63,7 @@ char * gtkAOALSAMixer;
 char * gtkAOALSAMixerChannel;
 char * gtkAOALSADevice;
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 char * gtkAOSDLDriver;
 #endif
 #ifdef CONFIG_ESD
@ -76,7 +76,7 @@ int    gtkCacheSize = 2048;
 int    gtkAutoSyncOn = 0;
 int    gtkAutoSync = 0;

-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 char * gtkDXR3Device;
 #endif

@ -111,7 +111,7 @@ static const m_option_t gui_opts[] =
 { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
 { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
 { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 { "vo_dxr3_device",&gtkDXR3Device,CONF_TYPE_STRING,0,0,0,NULL },
 #endif

@ -144,7 +144,7 @@ static const m_option_t gui_opts[] =
 { "ao_alsa_mixer_channel",&gtkAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
 { "ao_alsa_device",&gtkAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 { "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
 #ifdef CONFIG_ESD
--- a/gui/interface.c
+++ b/gui/interface.c
@ -185,7 +185,7 @@ void guiInit( void )
 guiIntfStruct.StreamType=-1;

 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
 #endif
 if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
@ -616,7 +616,7 @@ int guiGetEvent( int type,char * arg )
 	       guiGetEvent( guiSetDVD,(char *)stream->priv );
 	       break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	  case STREAMTYPE_VCD: 
 	       {
 	        int i;
@ -706,7 +706,7 @@ int guiGetEvent( int type,char * arg )
 	     }
 	 }
 // -- subtitle
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
 #ifdef CONFIG_LIBAVCODEC
 	 && !gtkVfLAVC
@ -743,7 +743,7 @@ int guiGetEvent( int type,char * arg )
         {
 	  case STREAMTYPE_PLAYLIST:
 	       break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	  case STREAMTYPE_VCD:
 	       {
 	        char tmp[512];
@ -795,7 +795,7 @@ int guiGetEvent( int type,char * arg )
 	   }
 	}

-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 #ifdef CONFIG_LIBAVCODEC
 	remove_vf( "lavc" );
 #endif
@ -857,7 +857,7 @@ int guiGetEvent( int type,char * arg )
 	  free(tmp);
 	 }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 	if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
 	 {
 	  char *tmp;
@ -1125,7 +1125,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 #ifdef CONFIG_DVDREAD
 	if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
 #endif
 	return NULL;
--- a/gui/interface.h
+++ b/gui/interface.h
@ -90,7 +90,7 @@ typedef struct
   int			Chapter;
 #endif

-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   int    VCDTracks;
 #endif

--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@ -72,7 +72,7 @@
 #include "../pixmaps/tonguebla.xpm"
 #include "../pixmaps/empty1px.xpm"
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 #include "../pixmaps/vcd.xpm"
 #include "../pixmaps/playvcd.xpm"
 #endif
@ -421,7 +421,7 @@ GtkWidget * create_PopUpMenu( void )
  AddSeparator( Menu );
   SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open );
    AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile"    ", evLoadPlay );
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD );
 #endif
 #ifdef CONFIG_DVDREAD
@ -446,7 +446,7 @@ GtkWidget * create_PopUpMenu( void )
 //    AddMenuItem( SubMenu,MSGTR_MENU_NormalSize"      ", evNormalSize );
 //    AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize );
 //    AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen );
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD );
    AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD );
    AddSeparator( VCDSubMenu );
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@ -178,7 +178,7 @@ static char * ao_driver[3];
 static char * vo_driver[3];
 static int    old_video_driver = 0;

-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 void ShowDXR3Config( void );
 void HideDXR3Config( void );
 #endif
@ -271,7 +271,7 @@ void ShowPreferences( void )
  gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 );
  gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver );
  gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
 }
@ -487,7 +487,7 @@ void HidePreferences( void )
 gtk_widget_destroy( Preferences );
 Preferences=NULL;
 HideAudioConfig();
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 HideDXR3Config();
 #endif
 }
@ -649,7 +649,7 @@ void prButton( GtkButton * button,gpointer user_data )
   case bVconfig:
 	if ( !vo_driver[0] ) break;
        gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); }
 #endif
 	break;
@ -790,7 +790,7 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g
   case 1: // video driver 
 	gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver ); 
 	gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
 	break;
@ -1388,7 +1388,7 @@ GList *appendOSSDevices(GList *l) {
    l = g_list_append(l, (gpointer)"/dev/dsp2");
    l = g_list_append(l, (gpointer)"/dev/dsp3");
  }
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  l = g_list_append(l, (gpointer)"/dev/em8300_ma");
  l = g_list_append(l, (gpointer)"/dev/em8300_ma-0");
  l = g_list_append(l, (gpointer)"/dev/em8300_ma-1");
@ -1450,7 +1450,7 @@ GList *appendALSAMixerChannels(GList *l) {
 }
 #endif

-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 GList *appendSDLDevices(GList *l) {
  l = g_list_append(l, (gpointer)"alsa");
  l = g_list_append(l, (gpointer)"arts");
@ -1517,7 +1517,7 @@ void ShowAudioConfig() {
    setGtkEntryText(CEAudioMixerChannel, gtkAOALSAMixerChannel);
  }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
  if (strncmp(ao_driver[0], "sdl", 3) == 0) {
    setGtkEntryText(CEAudioDevice, gtkAOSDLDriver);
  }
@ -1562,7 +1562,7 @@ static void audioButton(GtkButton *button, gpointer user_data) {
        gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
      }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
      if (strncmp(ao_driver[0], "sdl", 3) == 0) {
        gfree(&gtkAOSDLDriver);
        gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
@ -1620,7 +1620,7 @@ GtkWidget *create_AudioConfig() {
  if (strncmp(ao_driver[0], "alsa", 4) == 0)
    items = appendALSADevices(items);
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
  if (strncmp(ao_driver[0], "sdl", 3) == 0)
    items = appendSDLDevices(items);
 #endif
@ -1700,7 +1700,7 @@ GtkWidget *create_AudioConfig() {
  return AudioConfig;
 }

-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 // --- dxr3 config box

 static GtkWidget * DXR3Config;
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@ -77,7 +77,7 @@ static inline void TranslateFilename( int c,char * tmp,size_t tmplen )
            else av_strlcat( tmp,MSGTR_NoChapter,tmplen );
          break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   case STREAMTYPE_VCD:
        snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track );
 	break;
@ -174,7 +174,7 @@ calclengthmmmmss:
           switch ( guiIntfStruct.StreamType )
            {
             case STREAMTYPE_FILE:   av_strlcat( trbuf,"f",sizeof( trbuf ) ); break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
             case STREAMTYPE_VCD:    av_strlcat( trbuf,"v",sizeof( trbuf ) ); break;
 #endif
             case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break;
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@ -128,7 +128,7 @@ void mplEventHandling( int msg,float param )
        mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext); 
 	break;

-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   case evSetVCDTrack:
        guiIntfStruct.Track=iparam;
   case evPlayVCD:
@ -165,7 +165,7 @@ play:
 	  case STREAMTYPE_FILE:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiFilenames) );
 	       break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
          case STREAMTYPE_VCD:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) );
 	       if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
--- a/gui/mplayer/play.c
+++ b/gui/mplayer/play.c
@ -296,7 +296,7 @@ void mplCurr( void )
   case STREAMTYPE_DVD:
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   case STREAMTYPE_VCD:
 	break;
 #endif
@ -332,7 +332,7 @@ void mplPrev( void )
 	guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   case STREAMTYPE_VCD:
 	if ( --guiIntfStruct.Track == 0 ) { guiIntfStruct.Track=1; stop=1; }
 	break;
@ -368,7 +368,7 @@ void mplNext( void )
 	guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   case STREAMTYPE_VCD:
 	if ( ++guiIntfStruct.Track > guiIntfStruct.VCDTracks ) { guiIntfStruct.Track=guiIntfStruct.VCDTracks; stop=1; }
 	break;
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@ -12,7 +12,7 @@ static char help_text[]=
 "Основни опции:   (пълният списък е в ръководството - 'man mplayer')\n"
 " -vo <дрв[:устр]>  избор на видео драйвер & устройство ('-vo help' дава списък)\n"
 " -ao <дрв[:устр]>  избор на звуков драйвер & устройство ('-ao help' дава списък)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<пътечка>   пуска (S)VCD (Super Video CD) пътечка (без монтиране!)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@ -11,7 +11,7 @@ static char help_text[]=
 "Základní volby: (úplný seznam najdete v manuálové stránce)\n"
 " -vo <rozhraní>   vybere výstupní video rozhraní (seznam: -vo help)\n"
 " -ao <rozhraní>   vybere výstupní audio rozhraní (seznam: -ao help)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<č_stopy>  přehraje (S)VCD (Super Video CD) stopu (z nepřipojeného\n"
 "                  zařízení)\n"
 #endif
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@ -18,7 +18,7 @@ static char help_text[]=
 "Basisoptionen: (siehe Manpage für eine vollständige Liste aller Optionen!)\n"
 " -vo <drv>        Wähle Videoausgabetreiber ('-vo help' für eine Liste)\n"
 " -ao <drv>        Wähle Audioausgabetreiber ('-ao help' für eine Liste)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<tracknr>  Spiele einen (S)VCD-Titel (Super Video CD) ab\n"
 "                  ( direkter Gerätezugriff, kein mount! )\n"
 #endif
--- a/help/help_mp-dk.h
+++ b/help/help_mp-dk.h
@ -13,7 +13,7 @@ static char help_text[]=
 "Basale indstillinger (se manualen for en komplet liste):\n"
 " -vo <drv[:enhed]> vælg videodriver og enhed (detaljer, se '-vo help')\n"
 " -ao <drv[:enhed]> vælg lyddriver og enhed (detaljer, se '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<spor>  afspil et VCD (Video CD) spor fra et drev i stedet for en fil\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@ -11,7 +11,7 @@ static char help_text[]=
 "Βασικές επιλογές: (Ανατρέξτε στη  σελίδα εγχειριδίου για ολοκληρωμένη λίστα με επιλογές)\n"
 " -vo <drv[:dev]> επιλέξτε τον οδηγό εξόδου βίντεο και τη συσκευή (βλέπε '-vo help' για τη λίστα)\n"
 " -ao <drv[:dev]> επιλέξτε τον οδηγό εξόδου ήχου και τη συσκευή (βλέπε '-ao help' για τη λίστα)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<αριθμός track>  αναπαραγωγή track VCD (video cd)  από συσκευή αντί για αρχείο\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@ -19,7 +19,7 @@ static char help_text[]=
 "Basic options: (complete list in the man page)\n"
 " -vo <drv>        select video output driver ('-vo help' for a list)\n"
 " -ao <drv>        select audio output driver ('-ao help' for a list)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  play (S)VCD (Super Video CD) track (raw device, no mount)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@ -22,7 +22,7 @@ static char help_text[]=
 "Opciones básicas: ('man mplayer' para una lista completa)\n"
 " -vo <driver[:disp]>  Seleccionar driver de salida de video y dispositivo ('-vo help' para obtener una lista).\n"
 " -ao <driver[:disp]>  Seleccionar driver de salida de audio y dispositivo ('-ao help' para obtener una lista).\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<numpista>      Reproducir pista de (S)VCD (Super Video CD) (acceso directo al dispositivo, no montado)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@ -14,7 +14,7 @@ static char help_text[]=
 "Options de base :  (liste complète dans la page de man)\n"
 " -vo <pil[:pér]>  pilote et périph. vidéo de sortie ('-vo help' pour liste)\n"
 " -ao <pil[:pér]>  pilote et périph. audio de sortie ('-ao help' pour liste)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<n°piste>  lit piste (S)VCD (Super Video CD) (périf. brut, non-monté)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-hu.h
+++ b/help/help_mp-hu.h
@ -15,7 +15,7 @@ static char help_text[]=
 "Alapvető opciók: (az összes opció listájához lásd a man lapot)\n"
 " -vo <drv>        kimeneti videó meghajtó kiválasztása (lista: '-vo help')\n"
 " -ao <drv>        kimeneti audió meghajtó kiválasztása (lista: '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<sávszám>  (S)VCD (Super Video CD) sáv lejátszás (nyers, nincs mount)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@ -13,7 +13,7 @@ static char help_text[]=
 "Opzioni di base: (vedi la pagina man per la lista completa)\n"
 " -vo <drv[:dev]>  sceglie driver di uscita video ('-vo help' lista)\n"
 " -ao <drv[:dev]>  sceglie driver di uscita audio ('-ao help' lista)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  legge (S)VCD (Super Video CD) (dispositivo raw, non montato)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-ja.h
+++ b/help/help_mp-ja.h
@ -12,7 +12,7 @@ static char help_text[]=
 "基本的なオプション: (man page に全て網羅されています)\n"
 " -vo <drv[:dev]>  映像出力ドライバ及びデバイスを選択します ('-vo help'で一覧表示されます)\n"
 " -ao <drv[:dev]>  音声出力ドライバ及びデバイスを選択します ('-ao help'で一覧表示されます)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>   play VCD (Video CD) track from device instead of plain file\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-ko.h
+++ b/help/help_mp-ko.h
@ -10,7 +10,7 @@ static char help_text[]=
 "기본 선택사항: (전체 목록은 man 페이지 참조)\n"
 " -vo <drv[:dev]>  비디오 출력 드라이버 및 장치 선택 (목록보기는 '-vo help')\n"
 " -ao <drv[:dev]>  오디오 출력 드라이버 및 장치 선택 (목록보기는 '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  (S)VCD (Super Video CD) 트랙 재생 (장치로부터, 마운트 없이)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-mk.h
+++ b/help/help_mp-mk.h
@ -11,7 +11,7 @@ static char help_text[]=
 "Основни Опции: (комплетна листа на man страницата)\n"
 " -vo <drv[:dev]>  избира излезен видео драјвер и уред ('-vo help' за листа)\n"
 " -ao <drv[:dev]>  избира излезен аудио драјвер и уред ('-ao help' за листа)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>   пушта VCD (Video CD) од уред наместо од датотека\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@ -9,7 +9,7 @@ static char help_text[]=
 "Basis-opties: (volledige lijst in de man-pagina's)\n"
 " -vo <drv[:dev]>  selecteer video uitvoer driver & device (zie '-vo help' voor lijst)\n"
 " -ao <drv[:dev]>  selecteer audio uitvoer driver & device (zie '-ao help' voor lijst)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>   speel VCD (Video CD) track van cdrom in plaats van standaard bestand\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@ -12,7 +12,7 @@ static char help_text[]=
 "Podstawowe opcje: (pełna lista dostępna na stronie man)\n"
 " -vo <drv>        podaj wyjściowy sterownik video (lista: '-vo help')\n"
 " -ao <drv>        podaj wyjściowy sterownik audio (lista: '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<numer_ścieżki>  odtwórz ścieżkę (S)VCD (Super Video CD) (bezpośrednio, bez montowania)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-pt_BR.h
+++ b/help/help_mp-pt_BR.h
@ -14,7 +14,7 @@ static char help_text[]=
 "                 ('-vo help' para listar)\n"
 " -ao <drv[:dev]> seleciona o driver de saída de audio & dispositivo\n"
 "                 ('-vo help' para listar)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<numtrilha> reproduz trilha de VCD (Video CD) do dispositivo em vez de um\n"
 "                 arquivo\n"
 #endif
--- a/help/help_mp-ro.h
+++ b/help/help_mp-ro.h
@ -18,7 +18,7 @@ static char help_text[]=
 " -ao <drv[:dev]>  alege driver-ul ºi device-ul de ieºire audio\n"
 "                  ('-ao help' pentru listã)\n"

-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<nrpistã>  ruleazã pista VCD (Video CD) de pe device în loc de fiºier\n"
 #endif

--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@ -13,7 +13,7 @@ static char help_text[]=
 "Базовые опции: (полный список см. на man-странице)\n"
 " -vo <drv[:dev]> выбор драйвера и устройства видеовывода (список см. с '-vo help')\n"
 " -ao <drv[:dev]> выбор драйвера и устройства аудиовывода (список см. с '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<номер трека> играть дорожку (S)VCD (Super Video CD) (указывайте устройство,\n                 не монтируйте его)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-sk.h
+++ b/help/help_mp-sk.h
@ -13,7 +13,7 @@ static char help_text[]=
 "Základné prepínače: (Kompletný zoznam nájdete v man stránke)\n"
 " -vo <drv[:dev]> výber výstup. video ovládača&zariadenia (-vo help pre zoznam)\n"
 " -ao <drv[:dev]> výber výstup. audio ovládača&zariadenia (-ao help pre zoznam)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  prehrať VCD (video cd) stopu zo zariadenia namiesto zo súboru\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-sv.h
+++ b/help/help_mp-sv.h
@ -10,7 +10,7 @@ static char help_text[]=
 "Grundläggande argument: (komplett lista återfinns i `man mplayer`)\n"
 " -vo <drv[:enhet]>   välj video-ut drivrutin & enhet ('-vo help' för lista)\n"
 " -ao <drv[:enhet]>   välj audio-ut drivrutin & enhet ('-ao help' för lista)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<spårnr>      spela (S)VCD (Super Video CD) spår (rå enhet, ingen montering)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@ -13,7 +13,7 @@ static char help_text[]=
 "Genel seçenekler: (Tüm seçenekler için man sayfalarına bakınız)\n"
 " -vo <sürücü>          video çıkış sürücüsünü seçer ('-vo help' ile listeyi görebilirsiniz)\n"
 " -ao <sürücü>          ses çıkış sürücüsü seçer ('-ao help' ile listeyi görebilirsiniz)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<parçano>    (S)VCD (Süper Video CD) parça numarasını oynatır (sade aygıtı kullan, sisteme takma)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-uk.h
+++ b/help/help_mp-uk.h
@ -10,7 +10,7 @@ static char help_text[]=
 "Опції:\n"
 " -vo <drv[:dev]> вибір драйвера і пристрою відео виводу (список див. з '-vo help')\n"
 " -ao <drv[:dev]> вибір драйвера і пристрою аудіо виводу (список див. з '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<номер треку> грати VCD (video cd) трек з пристрою замість файлу\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@ -23,7 +23,7 @@ static char help_text[]=
 "基本选项：        （完整列表参见手册页）\n"
 " -vo <drv>        选择视频输出驱动程序（查看驱动程序列表用“-vo help”）\n"
 " -ao <drv>        选择音频输出驱动程序（查看驱动程序列表用“-ao help”）\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<曲目号>   播放 (S)VCD（超级VCD）曲目（无格式设备，无需装载）\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@ -15,7 +15,7 @@ static char help_text[]=
 "基本選項: (完整列表參見手册頁)\n"
 " -vo <drv>        選擇視頻輸出驅動 (查看驅動列表用“-vo help”)\n"
 " -ao <drv>        選擇音頻輸出驅動 (查看驅動列表用“-ao help”)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  播放 (S)VCD 軌迹號 (原始設備, 無需安挂)\n"
 #endif
 #ifdef CONFIG_DVDREAD
--- a/input/input.c
+++ b/input/input.c
@ -138,7 +138,7 @@ static const mp_cmd_t mp_cmds[] = {
  { MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1,  { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
 #endif
  { MP_CMD_SUB_FORCED_ONLY, "forced_subs_only",  0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
  { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
 #endif
  { MP_CMD_SWITCH_RATIO, "switch_ratio", 0, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
@ -154,7 +154,7 @@ static const mp_cmd_t mp_cmds[] = {
  { MP_CMD_LOADLIST, "loadlist", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
  { MP_CMD_RUN, "run", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
  { MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
  { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
  { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
 #endif
@ -421,7 +421,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = {
  { { 'n', 0 }, "tv_step_norm" },
  { { 'u', 0 }, "tv_step_chanlist" },
 #endif
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
  { { 'X', 0 }, "step_property teletext_mode 1" },
  { { 'W', 0 }, "step_property teletext_page 1" },
  { { 'Q', 0 }, "step_property teletext_page -1" },
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@ -79,20 +79,20 @@ const ao_functions_t* const audio_out_drivers[] =
 #ifdef HAVE_NAS
        &audio_out_nas,
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
        &audio_out_sdl,
 #endif
 #ifdef CONFIG_OPENAL
        &audio_out_openal,
 #endif
        &audio_out_mpegpes,
-#ifdef HAVE_DXR2
+#ifdef CONFIG_DXR2
        &audio_out_dxr2,
 #endif
-#ifdef HAVE_IVTV
+#ifdef CONFIG_IVTV
        &audio_out_ivtv,
 #endif
-#ifdef HAVE_V4L2_DECODER
+#ifdef CONFIG_V4L2_DECODER
        &audio_out_v4l2,
 #endif
        &audio_out_null,
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@ -40,7 +40,7 @@ menu_info_t* menu_info_list[] = {
  &menu_info_filesel,
  &menu_info_txt,
  &menu_info_console,
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
  &menu_info_dvbsel,
 #endif  
  &menu_info_pref,
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@ -86,7 +86,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
        &mpcodecs_vd_libmpeg2,
 #endif
        &mpcodecs_vd_mpegpes,
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
        &mpcodecs_vd_zrmjpeg,
 #endif
 #ifdef CONFIG_REALCODECS
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@ -128,7 +128,7 @@ static const vf_info_t* const filter_list[]={
    &vf_info_lavcdeint,
    &vf_info_screenshot,
 #endif
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
    &vf_info_zrmjpeg,
 #endif
    &vf_info_dvbscale,
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@ -12,7 +12,7 @@
 #endif

 #define MAX_PACKS 4096
-#ifdef HAVE_TV_BSDBT848
+#ifdef CONFIG_TV_BSDBT848
 #define MAX_PACK_BYTES 0x2000000
 #else
 #define MAX_PACK_BYTES 0x800000
--- a/libvo/sub.c
+++ b/libvo/sub.c
@ -14,7 +14,7 @@
 #define OSD_NAV_BOX_ALPHA 0x7f
 #endif

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 #include "stream/tv.h"
 #include "osdep/timer.h"
 #endif
@ -73,7 +73,7 @@ font_desc_t* vo_font=NULL;
 font_desc_t* sub_font=NULL;

 unsigned char* vo_osd_text=NULL;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 void* vo_osd_teletext_page=NULL;
 int vo_osd_teletext_half = 0;
 int vo_osd_teletext_mode=0;
@ -242,7 +242,7 @@ inline static void vo_update_nav (mp_osd_obj_t *obj, int dxs, int dys) {
 }
 #endif

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 // renders char to a big per-object buffer where alpha and bitmap are separated
 static void tt_draw_alpha_buf(mp_osd_obj_t* obj, int x0,int y0, int w,int h, unsigned char* src, int stride,int fg,int bg,int alpha)
 {
@ -1123,7 +1123,7 @@ int vo_update_osd(int dxs,int dys){
 	case OSDTYPE_SUBTITLE:
 	    vo_update_text_sub(obj,dxs,dys);
 	    break;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case OSDTYPE_TELETEXT:
 	    vo_update_text_teletext(obj,dxs,dys);
 	    break;
@ -1195,7 +1195,7 @@ void vo_init_osd(void){
 #ifdef CONFIG_DVDNAV
    new_osd_obj(OSDTYPE_DVDNAV);
 #endif
-#if HAVE_TV_TELETEXT
+#if CONFIG_TV_TELETEXT
    new_osd_obj(OSDTYPE_TELETEXT);
 #endif
 #ifdef HAVE_FREETYPE
@ -1236,7 +1236,7 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h,
 #ifdef CONFIG_DVDNAV
        case OSDTYPE_DVDNAV:
 #endif
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case OSDTYPE_TELETEXT:
 #endif
 	case OSDTYPE_OSD:
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@ -178,19 +178,19 @@ const vo_functions_t* const video_out_drivers[] =
 #ifdef CONFIG_CACA
 	&video_out_caca,
 #endif
-#ifdef HAVE_DXR2
+#ifdef CONFIG_DXR2
 	&video_out_dxr2,
 #endif
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	&video_out_dxr3,
 #endif
-#ifdef HAVE_IVTV
+#ifdef CONFIG_IVTV
        &video_out_ivtv,
 #endif
-#ifdef HAVE_V4L2_DECODER
+#ifdef CONFIG_V4L2_DECODER
        &video_out_v4l2,
 #endif
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
 	&video_out_zr,
 	&video_out_zr2,
 #endif
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@ -326,7 +326,7 @@ static int preinit(const char *arg)
 	
 	if(!shared_buffer)
 	{
-		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
 		//this chunk of code is heavily based off SDL_macosx.m from SDL 
 		//it uses an Apple private function to request foreground operation
 		void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
@ -913,7 +913,7 @@ static int control(uint32_t request, void *data, ...)
 	// Without SDL's bootstrap code (include SDL.h in mplayer.c),
 	// on Leopard, we got trouble to get the play window auto focused
 	// when app is actived. Following code fix this problem.
-#ifndef HAVE_SDL
+#ifndef CONFIG_SDL
 	if (isLeopardOrLater && [event type] == NSAppKitDefined
 			&& [event subtype] == NSApplicationActivatedEventType) {
 		[window makeMainWindow];
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@ -1141,7 +1141,7 @@ static int preinit(const char *arg)
        }
    }
 	
-#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
 	//this chunk of code is heavily based off SDL_macosx.m from SDL 
 	//it uses an Apple private function to request foreground operation
 {
--- a/mp_core.h
+++ b/mp_core.h
@ -92,7 +92,7 @@ typedef struct MPContext {

    int file_format;

-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
    int last_dvb_step;
    int dvbin_reopen;
 #endif
--- a/mpcommon.c
+++ b/mpcommon.c
@ -7,7 +7,7 @@
 #include "libvo/video_out.h"
 #include "spudec.h"
 #include "vobsub.h"
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 #include "stream/tv.h"
 #endif
 #include "libavutil/intreadwrite.h"
@ -165,7 +165,7 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)

 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset)
 {
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    tvi_handle_t* tvh=demuxer->priv;
    int page_changed;

--- a/mplayer.c
+++ b/mplayer.c
@ -112,7 +112,7 @@ char *heartbeat_cmd;
 #include "stream/stream_radio.h"
 #endif

-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
 #include "stream/cache2.h"
 #endif
@ -198,7 +198,7 @@ static MPContext mpctx_s = {
    .set_of_sub_pos = -1,
    .file_format = DEMUXER_TYPE_UNKNOWN,
    .loop_times = -1,
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
    .last_dvb_step = 1,
 #endif
 };
@ -1143,7 +1143,7 @@ void init_vo_spudec(void) {
 * make it all work is to use the builtin SDL-bootstrap code, which 
 * will be done automatically by replacing our main() if we include SDL.h.
 */
-#if defined(__APPLE__) && defined(HAVE_SDL)
+#if defined(__APPLE__) && defined(CONFIG_SDL)
 #include <SDL.h>
 #endif

@ -3410,7 +3410,7 @@ if(mpctx->sh_video){

 if(!mpctx->sh_video && !mpctx->sh_audio){
    mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 	if(mpctx->stream->type == STREAMTYPE_DVB)
 	{
 		int dir;
@ -3918,7 +3918,7 @@ if(rel_seek_secs || abs_seek_pos){

 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",mpctx->eof);

-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 if(mpctx->dvbin_reopen)
 {
  mpctx->eof = 0;
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@ -34,7 +34,7 @@
 #include <errno.h>
 #include "config.h"

-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	#include <linux/dvb/dmx.h>
 	#include <linux/dvb/frontend.h>
 #else
@ -50,7 +50,7 @@

 int dvb_get_tuner_type(int fe_fd)
 {
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
  struct dvb_frontend_info fe_info;
 #else
  FrontendInfo fe_info;
@ -98,7 +98,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt)
 	int i;
 	char frontend_dev[32], dvr_dev[32], demux_dev[32], sec_dev[32];

-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	sprintf(frontend_dev, "/dev/dvb/adapter%d/frontend0", n);
 	sprintf(dvr_dev, "/dev/dvb/adapter%d/dvr0", n);
 	sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", n);
@ -114,7 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt)
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno);
 		return 0;
 	}
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	priv->sec_fd=0;
 #else
 	priv->sec_fd = open(sec_dev, O_RDWR);
@ -159,7 +159,7 @@ int dvb_fix_demuxes(dvb_priv_t *priv, int cnt)
 	int i;
 	char demux_dev[32];

-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", priv->card);
 #else
 	sprintf(demux_dev, "/dev/ost/demux%d", priv->card);
@ -202,7 +202,7 @@ int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype)
 	pesFilterParams.pid     = pid;
 	pesFilterParams.input   = DMX_IN_FRONTEND;
 	pesFilterParams.output  = DMX_OUT_TS_TAP;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	pesFilterParams.pes_type = pestype;
 #else
 	pesFilterParams.pesType = pestype;
@ -268,7 +268,7 @@ int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int to
 }


-#ifndef HAVE_DVB_HEAD
+#ifndef CONFIG_DVB_HEAD
 static int SecGetStatus (int fd, struct secStatus *state)
 {
    if(ioctl(fd, SEC_GET_STATUS, state) < 0)
@ -331,7 +331,7 @@ static void print_status(fe_status_t festatus)
 {
 	mp_msg(MSGT_DEMUX, MSGL_V, "FE_STATUS:");
 	if (festatus & FE_HAS_SIGNAL) mp_msg(MSGT_DEMUX, MSGL_V," FE_HAS_SIGNAL");
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	if (festatus & FE_TIMEDOUT) mp_msg(MSGT_DEMUX, MSGL_V, " FE_TIMEDOUT");
 #else
 	if (festatus & FE_HAS_POWER) mp_msg(MSGT_DEMUX, MSGL_V, " FE_HAS_POWER");
@ -346,7 +346,7 @@ static void print_status(fe_status_t festatus)
 }


-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 static int check_status(int fd_frontend, int tmout)
 {
 	int32_t strength;
@ -500,7 +500,7 @@ static int check_status(int fd_frontend, int tmout)
 }
 #endif

-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD

 struct diseqc_cmd {
   struct dvb_diseqc_master_cmd cmd;
@ -585,7 +585,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
 	fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout)
 {
  int res, hi_lo, dfd;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
  struct dvb_frontend_parameters feparams;
  struct dvb_frontend_info fe_info;
 #else
@ -608,14 +608,14 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
  }


-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
  mp_msg(MSGT_DEMUX, MSGL_V, "Using DVB card \"%s\"\n", fe_info.name);
 #endif

  switch(fe_info.type)
  {
    case FE_OFDM:
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
      if (freq < 1000000) freq*=1000UL;
      feparams.frequency=freq;
      feparams.inversion=specInv;
@ -646,7 +646,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
        // this must be an absolute frequency
        if (freq < SLOF)
        {
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
          freq = feparams.frequency=(freq-LOF1);
 #else
          freq = feparams.Frequency=(freq-LOF1);
@ -655,7 +655,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
        }
        else
        {
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
          freq = feparams.frequency=(freq-LOF2);
 #else
          freq = feparams.Frequency=(freq-LOF2);
@ -666,14 +666,14 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
      else
      {
        // this is an L-Band frequency
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
       feparams.frequency=freq;
 #else
       feparams.Frequency=freq;
 #endif
      }

-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
      feparams.inversion=specInv;
      feparams.u.qpsk.symbol_rate=srate;
      feparams.u.qpsk.fec_inner=HP_CodeRate;
@ -697,7 +697,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
      break;
    case FE_QAM:
      mp_msg(MSGT_DEMUX, MSGL_V, "tuning DVB-C to %d, srate=%d\n",freq,srate);
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
      feparams.frequency=freq;
      feparams.inversion=specInv;
      feparams.u.qam.symbol_rate = srate;
@ -724,7 +724,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
  }
  usleep(100000);

-#ifndef HAVE_DVB_HEAD
+#ifndef CONFIG_DVB_HEAD
  if (fd_sec) SecGetStatus(fd_sec, &sec_state);
  while(1)
  {
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@ -14,7 +14,7 @@
 #define LOF1 (9750*1000UL)
 #define LOF2 (10600*1000UL)

-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	#include <linux/dvb/dmx.h>
 	#include <linux/dvb/frontend.h>
 	#include <linux/dvb/version.h>
--- a/stream/stream.c
+++ b/stream/stream.c
@ -65,7 +65,7 @@ extern const stream_info_t stream_info_ifo;
 extern const stream_info_t stream_info_dvd;

 static const stream_info_t* const auto_open_streams[] = {
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
  &stream_info_vcd,
 #endif
 #ifdef HAVE_CDDA
@ -85,7 +85,7 @@ static const stream_info_t* const auto_open_streams[] = {
  &stream_info_udp,
  &stream_info_http2,
 #endif
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
  &stream_info_dvb,
 #endif
 #ifdef CONFIG_TV
@ -94,7 +94,7 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_RADIO
  &stream_info_radio,
 #endif
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
  &stream_info_pvr,
 #endif
 #ifdef HAVE_FTP
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@ -288,7 +288,7 @@ static dvb_channels_list *dvb_get_channels(char *filename, int type)
 				ptr->cr =FEC_2_3;
 			else if(! strcmp(cr, "FEC_3_4"))
 				ptr->cr =FEC_3_4;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 			else if(! strcmp(cr, "FEC_4_5"))
 				ptr->cr =FEC_4_5;
 			else if(! strcmp(cr, "FEC_6_7"))
@ -358,7 +358,7 @@ static dvb_channels_list *dvb_get_channels(char *filename, int type)
 				ptr->cr_lp =FEC_2_3;
 			else if(! strcmp(tmp_lcr, "FEC_3_4"))
 				ptr->cr_lp =FEC_3_4;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 			else if(! strcmp(tmp_lcr, "FEC_4_5"))
 				ptr->cr_lp =FEC_4_5;
 			else if(! strcmp(tmp_lcr, "FEC_6_7"))
@ -381,7 +381,7 @@ static dvb_channels_list *dvb_get_channels(char *filename, int type)
 				ptr->hier = HIERARCHY_2;
 			else if(! strcmp(tmp_hier, "HIERARCHY_4"))
 				ptr->hier = HIERARCHY_4;
-#ifdef HAVE_DVB_HEAD				
+#ifdef CONFIG_DVB_HEAD
 			else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
 				ptr->hier = HIERARCHY_AUTO;
 #endif
@ -611,7 +611,7 @@ static void dvbin_close(stream_t *stream)
 	close(priv->dvr_fd);

 	close(priv->fe_fd);
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 	close(priv->sec_fd);
 #endif

--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@ -35,21 +35,21 @@
 #include <errno.h>
 #include <unistd.h>

-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
 #include <sys/param.h>
 #ifdef IOCTL_BT848_H_NAME
 #include IOCTL_BT848_H_NAME
 #endif

-#else // HAVE_RADIO_BSDBT848
+#else /* CONFIG_RADIO_BSDBT848 */

 #include <linux/types.h>

-#ifdef HAVE_RADIO_V4L2
+#ifdef CONFIG_RADIO_V4L2
 #include <linux/videodev2.h>
 #endif

-#ifdef HAVE_RADIO_V4L
+#ifdef CONFIG_RADIO_V4L
 #include <linux/videodev.h>
 #warning  "V4L is deprecated and will be removed in future"
 #endif
@ -91,7 +91,7 @@ typedef struct radio_channels_s {

 /// default values for options
 radio_param_t stream_radio_defaults={
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
    "/dev/tuner0", //device
    87.50,         //freq_min
    108.00,        //freq_max
@ -252,7 +252,7 @@ static int parse_channels(radio_priv_t* priv,float freq_channel,float* pfreq){
    return STREAM_OK;
 }

-#ifdef HAVE_RADIO_V4L2
+#ifdef CONFIG_RADIO_V4L2
 /*****************************************************************
 * \brief get fraction value for using in set_frequency and get_frequency
 * \return STREAM_OK if success, STREAM_ERROR otherwise
@ -409,8 +409,8 @@ static const radio_driver_t radio_driver_v4l2={
    set_frequency_v4l2,
    get_frequency_v4l2
 };
-#endif //HAVE_RADIO_V4L2
-#ifdef HAVE_RADIO_V4L
+#endif /* CONFIG_RADIO_V4L2 */
+#ifdef CONFIG_RADIO_V4L
 /*****************************************************************
 * \brief get fraction value for using in set_frequency and get_frequency
 * \return STREAM_OK if success, STREAM_ERROR otherwise
@ -540,8 +540,8 @@ static const radio_driver_t radio_driver_v4l={
    set_frequency_v4l,
    get_frequency_v4l
 };
-#endif //HAVE_RADIO_V4L
-#ifdef HAVE_RADIO_BSDBT848
+#endif /* CONFIG_RADIO_V4L */
+#ifdef CONFIG_RADIO_BSDBT848

 /*****************************************************************
 * \brief get fraction value for using in set_frequency and get_frequency
@ -652,7 +652,7 @@ static const radio_driver_t radio_driver_bsdbt848={
    set_frequency_bsdbt848,
    get_frequency_bsdbt848
 };
-#endif //HAVE_RADIO_BSDBT848
+#endif /* CONFIG_RADIO_BSDBT848 */

 static inline int init_frac(radio_priv_t* priv){ 
    return priv->driver->init_frac(priv);
@ -1080,13 +1080,13 @@ static int fill_buffer_s(struct stream_st *s, char* buffer, int max_len){
 when no driver explicitly specified first available will be used
 */
 static const radio_driver_t* radio_drivers[]={
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
    &radio_driver_bsdbt848,
 #endif
-#ifdef HAVE_RADIO_V4L2
+#ifdef CONFIG_RADIO_V4L2
    &radio_driver_v4l2,
 #endif
-#ifdef HAVE_RADIO_V4L
+#ifdef CONFIG_RADIO_V4L
    &radio_driver_v4l,
 #endif
    0
--- a/stream/stream_radio.h
+++ b/stream/stream_radio.h
@ -9,7 +9,7 @@
 typedef struct radio_param_s{
    /** name of radio device file */
    char*   device;
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
    /** minimal allowed frequency */
    float   freq_min;
    /** maximal allowed frequency */
--- a/stream/tv.c
+++ b/stream/tv.c
@ -49,16 +49,16 @@ extern const tvi_info_t tvi_info_bsdbt848;

 /** List of drivers in autodetection order */
 static const tvi_info_t* tvi_driver_list[]={
-#ifdef HAVE_TV_V4L2
+#ifdef CONFIG_TV_V4L2
    &tvi_info_v4l2,
 #endif
-#ifdef HAVE_TV_V4L1
+#ifdef CONFIG_TV_V4L1
    &tvi_info_v4l,
 #endif
-#ifdef HAVE_TV_BSDBT848
+#ifdef CONFIG_TV_BSDBT848
    &tvi_info_bsdbt848,
 #endif
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
    &tvi_info_dshow,
 #endif
    &tvi_info_dummy,
@ -404,12 +404,12 @@ static int open_tv(tvi_handle_t *tvh)
    /* set some params got from cmdline */
    funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input);

-#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
+#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
    if (0
-#ifdef HAVE_TV_V4L2
+#ifdef CONFIG_TV_V4L2
    || (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0)
 #endif
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
    || (!strcmp(tvh->tv_param->driver, "dshow") && tvh->tv_param->normid >= 0)
 #endif
    )
@ -418,7 +418,7 @@ static int open_tv(tvi_handle_t *tvh)
 #endif
    tv_set_norm(tvh,tvh->tv_param->norm);

-#ifdef HAVE_TV_V4L1
+#ifdef CONFIG_TV_V4L1
    if ( tvh->tv_param->mjpeg )
    {
      /* set width to expected value */
--- a/stream/tvi_dshow.c
+++ b/stream/tvi_dshow.c
@ -2306,7 +2306,7 @@ static int get_audio_framesize(priv_t * priv)
    return priv->chains[1]->rbuf->blocksize;
 }

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int vbi_get_props(priv_t* priv,tt_stream_props* ptsp)
 {
    if(!priv || !ptsp)
@ -2352,7 +2352,7 @@ static void vbi_grabber(priv_t* priv)
    }
    free(buf);
 }
-#endif //HAVE_TV_TELETEXT
+#endif /* CONFIG_TV_TELETEXT */

 /**
 * \brief fills given buffer with video data (usually one frame)
@ -2397,7 +2397,7 @@ static double grab_video_frame(priv_t * priv, char *buffer, int len)
      rb->count--;
    LeaveCriticalSection(rb->pMutex);

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    vbi_grabber(priv);
 #endif
    return pts;
@ -2588,7 +2588,7 @@ static HRESULT build_audio_chain(priv_t *priv)
 */
 static HRESULT build_vbi_chain(priv_t *priv)
 {
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    HRESULT hr;

    if(priv->chains[2]->rbuf)
@ -2944,7 +2944,7 @@ static int init(priv_t * priv)
            OLE_QUERYINTERFACE(priv->pBuilder,IID_IBaseFilter,pBF);
            OLE_CALL_ARGS(pBF,SetSyncSource,rc);
        }
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
       if(vbi_get_props(priv,&(priv->tsp))!=TVI_CONTROL_TRUE)
           break;
 #endif
@ -3017,7 +3017,7 @@ static int uninit(priv_t * priv)
    if (priv->dwRegister) {
        RemoveFromRot(priv->dwRegister);
    }
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    teletext_control(priv->priv_vbi,TV_VBI_CONTROL_STOP,(void*)1);
 #endif
    //stop audio grabber thread
@ -3524,7 +3524,7 @@ static int control(priv_t * priv, int cmd, void *arg)
    case TVI_CONTROL_IMMEDIATE:
 	priv->immediate_mode = 1;
 	return TVI_CONTROL_TRUE;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    case TVI_CONTROL_VBI_INIT:
    {
        void* ptr;
--- a/stream/tvi_v4l.c
+++ b/stream/tvi_v4l.c
@ -141,7 +141,7 @@ typedef struct {
    long                        audio_recv_blocks_total;
    long                        audio_sent_blocks_total;
    long                        mjpeg_bufsize;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    char                        *vbi_dev;
    int                         vbi_fd;
    int                         vbi_bufsize;
@ -675,7 +675,7 @@ static int uninit(priv_t *priv)
 {
    unsigned long num;

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    priv->vbi_shutdown=1;
    if(priv->vbi_grabber_thread)
        pthread_join(priv->vbi_grabber_thread, NULL);
@ -781,7 +781,7 @@ static int get_capture_buffer_size(priv_t *priv)
    return cnt;
 }

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int vbi_init(priv_t* priv,char* device)
 {
    int vbi_fd=0;
@ -897,7 +897,7 @@ static void *vbi_grabber(void *data)
    free(buf);
    return NULL;
 }
-#endif //HAVE_TV_TELETEXT
+#endif /* CONFIG_TV_TELETEXT */

 static int start(priv_t *priv)
 {
@ -1111,7 +1111,7 @@ static int start(priv_t *priv)
        ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]);
    }

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    /* start vbi thread */
    if(priv->priv_vbi){
        priv->vbi_shutdown = 0;
@ -1511,7 +1511,7 @@ static int control(priv_t *priv, int cmd, void *arg)
            priv->immediate_mode = 1;
            return TVI_CONTROL_TRUE;
        }
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
        case TVI_CONTROL_VBI_INIT:
        {
            void* ptr;
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@ -77,7 +77,7 @@ typedef struct {
    /* video */
    char                        *video_dev;
    int                         video_fd;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    char                        *vbi_dev;
    int                         vbi_fd;
    int                         vbi_bufsize;
@ -580,7 +580,7 @@ static int get_control(priv_t *priv, struct v4l2_control *control, int val_signe
    return TVI_CONTROL_TRUE;
 }

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int vbi_init(priv_t* priv,char* device)
 {
    int vbi_fd=0;
@ -703,7 +703,7 @@ static void *vbi_grabber(void *data)
    free(buf);
    return NULL;
 }
-#endif //HAVE_TV_TELETEXT
+#endif /* CONFIG_TV_TELETEXT */

 static int control(priv_t *priv, int cmd, void *arg)
 {
@ -1019,7 +1019,7 @@ static int control(priv_t *priv, int cmd, void *arg)
        if (audio_in_set_samplerate(&priv->audio_in, *(int*)arg) < 0) return TVI_CONTROL_FALSE;
 //        setup_audio_buffer_sizes(priv);
        return TVI_CONTROL_TRUE;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    case TVI_CONTROL_VBI_INIT:
    {
        void* ptr;
@ -1086,7 +1086,7 @@ static int uninit(priv_t *priv)
 {
    int i, frames, dropped = 0;

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    priv->vbi_shutdown=1;
    if(priv->vbi_grabber_thread)
        pthread_join(priv->vbi_grabber_thread, NULL);
@ -1540,7 +1540,7 @@ static int start(priv_t *priv)
        }
    }

-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
    /* start vbi thread */
    if(priv->priv_vbi){
        priv->vbi_shutdown = 0;