Mercurial > mplayer.hg

comparison configure @ 27365:13c920fdf7f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change a bunch of video-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Sat, 02 Aug 2008 17:38:11 +0000
parents 40057010b1fa
children 8598536ca4f5
comparison
equal deleted inserted replaced
27364:4864676b338f 27365:13c920fdf7f5
3740 ######### 3740 #########
3741 3741
3742 3742
3743 echocheck "tdfxfb" 3743 echocheck "tdfxfb"
3744 if test "$_tdfxfb" = yes ; then 3744 if test "$_tdfxfb" = yes ; then
3745 _def_tdfxfb='#define HAVE_TDFXFB 1' 3745 _def_tdfxfb='#define CONFIG_TDFXFB 1'
3746 _vosrc="$_vosrc vo_tdfxfb.c" 3746 _vosrc="$_vosrc vo_tdfxfb.c"
3747 _vomodules="tdfxfb $_vomodules" 3747 _vomodules="tdfxfb $_vomodules"
3748 else 3748 else
3749 _def_tdfxfb='#undef HAVE_TDFXFB' 3749 _def_tdfxfb='#undef CONFIG_TDFXFB'
3750 _novomodules="tdfxfb $_novomodules" 3750 _novomodules="tdfxfb $_novomodules"
3751 fi 3751 fi
3752 echores "$_tdfxfb" 3752 echores "$_tdfxfb"
3753 3753
3754 echocheck "s3fb" 3754 echocheck "s3fb"
3755 if test "$_s3fb" = yes ; then 3755 if test "$_s3fb" = yes ; then
3756 _def_s3fb='#define HAVE_S3FB 1' 3756 _def_s3fb='#define CONFIG_S3FB 1'
3757 _vosrc="$_vosrc vo_s3fb.c" 3757 _vosrc="$_vosrc vo_s3fb.c"
3758 _vomodules="s3fb $_vomodules" 3758 _vomodules="s3fb $_vomodules"
3759 else 3759 else
3760 _def_s3fb='#undef HAVE_S3FB' 3760 _def_s3fb='#undef CONFIG_S3FB'
3761 _novomodules="s3fb $_novomodules" 3761 _novomodules="s3fb $_novomodules"
3762 fi 3762 fi
3763 echores "$_s3fb" 3763 echores "$_s3fb"
3764 3764
3765 echocheck "tdfxvid" 3765 echocheck "tdfxvid"
3766 if test "$_tdfxvid" = yes ; then 3766 if test "$_tdfxvid" = yes ; then
3767 _def_tdfxvid='#define HAVE_TDFX_VID 1' 3767 _def_tdfxvid='#define CONFIG_TDFX_VID 1'
3768 _vosrc="$_vosrc vo_tdfx_vid.c" 3768 _vosrc="$_vosrc vo_tdfx_vid.c"
3769 _vomodules="tdfx_vid $_vomodules" 3769 _vomodules="tdfx_vid $_vomodules"
3770 else 3770 else
3771 _def_tdfxvid='#undef HAVE_TDFX_VID' 3771 _def_tdfxvid='#undef CONFIG_TDFX_VID'
3772 _novomodules="tdfx_vid $_novomodules" 3772 _novomodules="tdfx_vid $_novomodules"
3773 fi 3773 fi
3774 echores "$_tdfxvid" 3774 echores "$_tdfxvid"
3775 3775
3776 echocheck "xvr100" 3776 echocheck "xvr100"
3789 EOF 3789 EOF
3790 _xvr100=no 3790 _xvr100=no
3791 cc_check && _xvr100=yes 3791 cc_check && _xvr100=yes
3792 fi 3792 fi
3793 if test "$_xvr100" = yes ; then 3793 if test "$_xvr100" = yes ; then
3794 _def_xvr100='#define HAVE_XVR100 1' 3794 _def_xvr100='#define CONFIG_XVR100 1'
3795 _vosrc="$_vosrc vo_xvr100.c" 3795 _vosrc="$_vosrc vo_xvr100.c"
3796 _vomodules="xvr100 $_vomodules" 3796 _vomodules="xvr100 $_vomodules"
3797 else 3797 else
3798 _def_tdfxvid='#undef HAVE_XVR100' 3798 _def_tdfxvid='#undef CONFIG_XVR100'
3799 _novomodules="xvr100 $_novomodules" 3799 _novomodules="xvr100 $_novomodules"
3800 fi 3800 fi
3801 echores "$_xvr100" 3801 echores "$_xvr100"
3802 3802
3803 echocheck "tga" 3803 echocheck "tga"
3804 if test "$_tga" = yes ; then 3804 if test "$_tga" = yes ; then
3805 _def_tga='#define HAVE_TGA 1' 3805 _def_tga='#define CONFIG_TGA 1'
3806 _vosrc="$_vosrc vo_tga.c" 3806 _vosrc="$_vosrc vo_tga.c"
3807 _vomodules="tga $_vomodules" 3807 _vomodules="tga $_vomodules"
3808 else 3808 else
3809 _def_tga='#undef HAVE_TGA' 3809 _def_tga='#undef CONFIG_TGA'
3810 _novomodules="tga $_novomodules" 3810 _novomodules="tga $_novomodules"
3811 fi 3811 fi
3812 echores "$_tga" 3812 echores "$_tga"
3813 3813
3814 3814
3815 echocheck "md5sum support" 3815 echocheck "md5sum support"
3816 if test "$_md5sum" = yes; then 3816 if test "$_md5sum" = yes; then
3817 _def_md5sum="#define HAVE_MD5SUM" 3817 _def_md5sum="#define CONFIG_MD5SUM"
3818 _vosrc="$_vosrc vo_md5sum.c" 3818 _vosrc="$_vosrc vo_md5sum.c"
3819 _vomodules="md5sum $_vomodules" 3819 _vomodules="md5sum $_vomodules"
3820 else 3820 else
3821 _def_md5sum="#undef HAVE_MD5SUM" 3821 _def_md5sum="#undef CONFIG_MD5SUM"
3822 _novomodules="md5sum $_novomodules" 3822 _novomodules="md5sum $_novomodules"
3823 fi 3823 fi
3824 echores "$_md5sum" 3824 echores "$_md5sum"
3825 3825
3826 3826
3827 echocheck "yuv4mpeg support" 3827 echocheck "yuv4mpeg support"
3828 if test "$_yuv4mpeg" = yes; then 3828 if test "$_yuv4mpeg" = yes; then
3829 _def_yuv4mpeg="#define HAVE_YUV4MPEG" 3829 _def_yuv4mpeg="#define CONFIG_YUV4MPEG"
3830 _vosrc="$_vosrc vo_yuv4mpeg.c" 3830 _vosrc="$_vosrc vo_yuv4mpeg.c"
3831 _vomodules="yuv4mpeg $_vomodules" 3831 _vomodules="yuv4mpeg $_vomodules"
3832 else 3832 else
3833 _def_yuv4mpeg="#undef HAVE_YUV4MPEG" 3833 _def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
3834 _novomodules="yuv4mpeg $_novomodules" 3834 _novomodules="yuv4mpeg $_novomodules"
3835 fi 3835 fi
3836 echores "$_yuv4mpeg" 3836 echores "$_yuv4mpeg"
3837 3837
3838 3838
3839 echocheck "bl" 3839 echocheck "bl"
3840 if test "$_bl" = yes ; then 3840 if test "$_bl" = yes ; then
3841 _def_bl='#define HAVE_BL 1' 3841 _def_bl='#define CONFIG_BL 1'
3842 _vosrc="$_vosrc vo_bl.c" 3842 _vosrc="$_vosrc vo_bl.c"
3843 _vomodules="bl $_vomodules" 3843 _vomodules="bl $_vomodules"
3844 else 3844 else
3845 _def_bl='#undef HAVE_BL' 3845 _def_bl='#undef CONFIG_BL'
3846 _novomodules="bl $_novomodules" 3846 _novomodules="bl $_novomodules"
3847 fi 3847 fi
3848 echores "$_bl" 3848 echores "$_bl"
3849 3849
3850 3850
3894 fi 3894 fi
3895 fi 3895 fi
3896 echores "$_directfb" 3896 echores "$_directfb"
3897 3897
3898 if test "$_directfb" = yes ; then 3898 if test "$_directfb" = yes ; then
3899 _def_directfb='#define HAVE_DIRECTFB 1' 3899 _def_directfb='#define CONFIG_DIRECTFB 1'
3900 _vosrc="$_vosrc vo_directfb2.c" 3900 _vosrc="$_vosrc vo_directfb2.c"
3901 _vomodules="directfb $_vomodules" 3901 _vomodules="directfb $_vomodules"
3902 _libs_mplayer="$_libs_mplayer -ldirectfb" 3902 _libs_mplayer="$_libs_mplayer -ldirectfb"
3903 else 3903 else
3904 _def_directfb='#undef HAVE_DIRECTFB' 3904 _def_directfb='#undef CONFIG_DIRECTFB'
3905 _novomodules="directfb $_novomodules" 3905 _novomodules="directfb $_novomodules"
3906 fi 3906 fi
3907 if test "$_dfbmga" = yes; then 3907 if test "$_dfbmga" = yes; then
3908 _vosrc="$_vosrc vo_dfbmga.c" 3908 _vosrc="$_vosrc vo_dfbmga.c"
3909 _vomodules="dfbmga $_vomodules" 3909 _vomodules="dfbmga $_vomodules"
3910 _def_dfbmga='#define HAVE_DFBMGA 1' 3910 _def_dfbmga='#define CONFIG_DFBMGA 1'
3911 else 3911 else
3912 _novomodules="dfbmga $_novomodules" 3912 _novomodules="dfbmga $_novomodules"
3913 _def_dfbmga='#undef HAVE_DFBMGA' 3913 _def_dfbmga='#undef CONFIG_DFBMGA'
3914 fi 3914 fi
3915 3915
3916 3916
3917 echocheck "X11 headers presence" 3917 echocheck "X11 headers presence"
3918 _x11_headers="no" 3918 _x11_headers="no"
4186 echores "$_dga" 4186 echores "$_dga"
4187 4187
4188 4188
4189 echocheck "3dfx" 4189 echocheck "3dfx"
4190 if test "$_3dfx" = yes && test "$_dga" = yes ; then 4190 if test "$_3dfx" = yes && test "$_dga" = yes ; then
4191 _def_3dfx='#define HAVE_3DFX 1' 4191 _def_3dfx='#define CONFIG_3DFX 1'
4192 _vosrc="$_vosrc vo_3dfx.c" 4192 _vosrc="$_vosrc vo_3dfx.c"
4193 _vomodules="3dfx $_vomodules" 4193 _vomodules="3dfx $_vomodules"
4194 else 4194 else
4195 _def_3dfx='#undef HAVE_3DFX' 4195 _def_3dfx='#undef CONFIG_3DFX'
4196 _novomodules="3dfx $_novomodules" 4196 _novomodules="3dfx $_novomodules"
4197 fi 4197 fi
4198 echores "$_3dfx" 4198 echores "$_3dfx"
4199 4199
4200 4200
4235 fi 4235 fi
4236 else 4236 else
4237 _gl=no 4237 _gl=no
4238 fi 4238 fi
4239 if test "$_gl" = yes ; then 4239 if test "$_gl" = yes ; then
4240 _def_gl='#define HAVE_GL 1' 4240 _def_gl='#define CONFIG_GL 1'
4241 _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c" 4241 _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
4242 if test "$_gl_win32" = yes ; then 4242 if test "$_gl_win32" = yes ; then
4243 _def_gl_win32='#define GL_WIN32 1' 4243 _def_gl_win32='#define GL_WIN32 1'
4244 _vosrc="$_vosrc w32_common.c" 4244 _vosrc="$_vosrc w32_common.c"
4245 _res_comment="win32 version" 4245 _res_comment="win32 version"
4246 fi 4246 fi
4247 _vomodules="opengl $_vomodules" 4247 _vomodules="opengl $_vomodules"
4248 else 4248 else
4249 _def_gl='#undef HAVE_GL' 4249 _def_gl='#undef CONFIG_GL'
4250 _def_gl_win32='#undef GL_WIN32' 4250 _def_gl_win32='#undef GL_WIN32'
4251 _novomodules="opengl $_novomodules" 4251 _novomodules="opengl $_novomodules"
4252 fi 4252 fi
4253 echores "$_gl" 4253 echores "$_gl"
4254 4254
4345 if test "$_mga" = auto ; then 4345 if test "$_mga" = auto ; then
4346 _mga=no 4346 _mga=no
4347 test -c /dev/mga_vid && _mga=yes 4347 test -c /dev/mga_vid && _mga=yes
4348 fi 4348 fi
4349 if test "$_mga" = yes ; then 4349 if test "$_mga" = yes ; then
4350 _def_mga='#define HAVE_MGA 1' 4350 _def_mga='#define CONFIG_MGA 1'
4351 _vosrc="$_vosrc vo_mga.c" 4351 _vosrc="$_vosrc vo_mga.c"
4352 _vomodules="mga $_vomodules" 4352 _vomodules="mga $_vomodules"
4353 else 4353 else
4354 _def_mga='#undef HAVE_MGA' 4354 _def_mga='#undef CONFIG_MGA'
4355 _novomodules="mga $_novomodules" 4355 _novomodules="mga $_novomodules"
4356 fi 4356 fi
4357 echores "$_mga" 4357 echores "$_mga"
4358 4358
4359 4359
4361 if test "$_xmga" = auto ; then 4361 if test "$_xmga" = auto ; then
4362 _xmga=no 4362 _xmga=no
4363 test "$_x11" = yes && test "$_mga" = yes && _xmga=yes 4363 test "$_x11" = yes && test "$_mga" = yes && _xmga=yes
4364 fi 4364 fi
4365 if test "$_xmga" = yes ; then 4365 if test "$_xmga" = yes ; then
4366 _def_xmga='#define HAVE_XMGA 1' 4366 _def_xmga='#define CONFIG_XMGA 1'
4367 _vosrc="$_vosrc vo_xmga.c" 4367 _vosrc="$_vosrc vo_xmga.c"
4368 _vomodules="xmga $_vomodules" 4368 _vomodules="xmga $_vomodules"
4369 else 4369 else
4370 _def_xmga='#undef HAVE_XMGA' 4370 _def_xmga='#undef CONFIG_XMGA'
4371 _novomodules="xmga $_novomodules" 4371 _novomodules="xmga $_novomodules"
4372 fi 4372 fi
4373 echores "$_xmga" 4373 echores "$_xmga"
4374 4374
4375 4375
4381 EOF 4381 EOF
4382 _ggi=no 4382 _ggi=no
4383 cc_check -lggi && _ggi=yes 4383 cc_check -lggi && _ggi=yes
4384 fi 4384 fi
4385 if test "$_ggi" = yes ; then 4385 if test "$_ggi" = yes ; then
4386 _def_ggi='#define HAVE_GGI 1' 4386 _def_ggi='#define CONFIG_GGI 1'
4387 _libs_mplayer="$_libs_mplayer -lggi" 4387 _libs_mplayer="$_libs_mplayer -lggi"
4388 _vosrc="$_vosrc vo_ggi.c" 4388 _vosrc="$_vosrc vo_ggi.c"
4389 _vomodules="ggi $_vomodules" 4389 _vomodules="ggi $_vomodules"
4390 else 4390 else
4391 _def_ggi='#undef HAVE_GGI' 4391 _def_ggi='#undef CONFIG_GGI'
4392 _novomodules="ggi $_novomodules" 4392 _novomodules="ggi $_novomodules"
4393 fi 4393 fi
4394 echores "$_ggi" 4394 echores "$_ggi"
4395 4395
4396 echocheck "GGI extension: libggiwmh" 4396 echocheck "GGI extension: libggiwmh"
4404 cc_check -lggi -lggiwmh && _ggiwmh=yes 4404 cc_check -lggi -lggiwmh && _ggiwmh=yes
4405 fi 4405 fi
4406 # needed to get right output on obscure combination 4406 # needed to get right output on obscure combination
4407 # like --disable-ggi --enable-ggiwmh 4407 # like --disable-ggi --enable-ggiwmh
4408 if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then 4408 if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then
4409 _def_ggiwmh='#define HAVE_GGIWMH 1' 4409 _def_ggiwmh='#define CONFIG_GGIWMH 1'
4410 _libs_mplayer="$_libs_mplayer -lggiwmh" 4410 _libs_mplayer="$_libs_mplayer -lggiwmh"
4411 else 4411 else
4412 _ggiwmh=no 4412 _ggiwmh=no
4413 _def_ggiwmh='#undef HAVE_GGIWMH' 4413 _def_ggiwmh='#undef CONFIG_GGIWMH'
4414 fi 4414 fi
4415 echores "$_ggiwmh" 4415 echores "$_ggiwmh"
4416 4416
4417 4417
4418 echocheck "AA" 4418 echocheck "AA"
4434 for _ld_tmp in "-laa" ; do 4434 for _ld_tmp in "-laa" ; do
4435 cc_check $_ld_tmp && _libs_mplayer="$_libs_mplayer $_ld_tmp" && _aa=yes && break 4435 cc_check $_ld_tmp && _libs_mplayer="$_libs_mplayer $_ld_tmp" && _aa=yes && break
4436 done 4436 done
4437 fi 4437 fi
4438 if test "$_aa" = yes ; then 4438 if test "$_aa" = yes ; then
4439 _def_aa='#define HAVE_AA 1' 4439 _def_aa='#define CONFIG_AA 1'
4440 if cygwin ; then 4440 if cygwin ; then
4441 _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`" 4441 _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
4442 fi 4442 fi
4443 _vosrc="$_vosrc vo_aa.c" 4443 _vosrc="$_vosrc vo_aa.c"
4444 _vomodules="aa $_vomodules" 4444 _vomodules="aa $_vomodules"
4445 else 4445 else
4446 _def_aa='#undef HAVE_AA' 4446 _def_aa='#undef CONFIG_AA'
4447 _novomodules="aa $_novomodules" 4447 _novomodules="aa $_novomodules"
4448 fi 4448 fi
4449 echores "$_aa" 4449 echores "$_aa"
4450 4450
4451 4451
4462 EOF 4462 EOF
4463 cc_check `caca-config --libs` && _caca=yes 4463 cc_check `caca-config --libs` && _caca=yes
4464 fi 4464 fi
4465 fi 4465 fi
4466 if test "$_caca" = yes ; then 4466 if test "$_caca" = yes ; then
4467 _def_caca='#define HAVE_CACA 1' 4467 _def_caca='#define CONFIG_CACA 1'
4468 _inc_extra="$_inc_extra `caca-config --cflags`" 4468 _inc_extra="$_inc_extra `caca-config --cflags`"
4469 _libs_mplayer="$_libs_mplayer `caca-config --libs`" 4469 _libs_mplayer="$_libs_mplayer `caca-config --libs`"
4470 _vosrc="$_vosrc vo_caca.c" 4470 _vosrc="$_vosrc vo_caca.c"
4471 _vomodules="caca $_vomodules" 4471 _vomodules="caca $_vomodules"
4472 else 4472 else
4473 _def_caca='#undef HAVE_CACA' 4473 _def_caca='#undef CONFIG_CACA'
4474 _novomodules="caca $_novomodules" 4474 _novomodules="caca $_novomodules"
4475 fi 4475 fi
4476 echores "$_caca" 4476 echores "$_caca"
4477 4477
4478 4478
4484 EOF 4484 EOF
4485 _svga=no 4485 _svga=no
4486 cc_check -lvga $_ld_lm && _svga=yes 4486 cc_check -lvga $_ld_lm && _svga=yes
4487 fi 4487 fi
4488 if test "$_svga" = yes ; then 4488 if test "$_svga" = yes ; then
4489 _def_svga='#define HAVE_SVGALIB 1' 4489 _def_svga='#define CONFIG_SVGALIB 1'
4490 _libs_mplayer="$_libs_mplayer -lvga" 4490 _libs_mplayer="$_libs_mplayer -lvga"
4491 _vosrc="$_vosrc vo_svga.c" 4491 _vosrc="$_vosrc vo_svga.c"
4492 _vomodules="svga $_vomodules" 4492 _vomodules="svga $_vomodules"
4493 else 4493 else
4494 _def_svga='#undef HAVE_SVGALIB' 4494 _def_svga='#undef CONFIG_SVGALIB'
4495 _novomodules="svga $_novomodules" 4495 _novomodules="svga $_novomodules"
4496 fi 4496 fi
4497 echores "$_svga" 4497 echores "$_svga"
4498 4498
4499 4499
4501 if test "$_fbdev" = auto ; then 4501 if test "$_fbdev" = auto ; then
4502 _fbdev=no 4502 _fbdev=no
4503 linux && _fbdev=yes 4503 linux && _fbdev=yes
4504 fi 4504 fi
4505 if test "$_fbdev" = yes ; then 4505 if test "$_fbdev" = yes ; then
4506 _def_fbdev='#define HAVE_FBDEV 1' 4506 _def_fbdev='#define CONFIG_FBDEV 1'
4507 _vosrc="$_vosrc vo_fbdev.c vo_fbdev2.c" 4507 _vosrc="$_vosrc vo_fbdev.c vo_fbdev2.c"
4508 _vomodules="fbdev $_vomodules" 4508 _vomodules="fbdev $_vomodules"
4509 else 4509 else
4510 _def_fbdev='#undef HAVE_FBDEV' 4510 _def_fbdev='#undef CONFIG_FBDEV'
4511 _novomodules="fbdev $_novomodules" 4511 _novomodules="fbdev $_novomodules"
4512 fi 4512 fi
4513 echores "$_fbdev" 4513 echores "$_fbdev"
4514 4514
4515 4515
4768 EOF 4768 EOF
4769 _vesa=no 4769 _vesa=no
4770 cc_check -lvbe -llrmi && _vesa=yes 4770 cc_check -lvbe -llrmi && _vesa=yes
4771 fi 4771 fi
4772 if test "$_vesa" = yes ; then 4772 if test "$_vesa" = yes ; then
4773 _def_vesa='#define HAVE_VESA 1' 4773 _def_vesa='#define CONFIG_VESA 1'
4774 _libs_mplayer="$_libs_mplayer -lvbe -llrmi" 4774 _libs_mplayer="$_libs_mplayer -lvbe -llrmi"
4775 _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c" 4775 _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c"
4776 _vomodules="vesa $_vomodules" 4776 _vomodules="vesa $_vomodules"
4777 else 4777 else
4778 _def_vesa='#undef HAVE_VESA' 4778 _def_vesa='#undef CONFIG_VESA'
4779 _novomodules="vesa $_novomodules" 4779 _novomodules="vesa $_novomodules"
4780 fi 4780 fi
4781 echores "$_vesa" 4781 echores "$_vesa"
4782 4782
4783 ################# 4783 #################
8685 $_def_twolame 8685 $_def_twolame
8686 8686
8687 /* used by GUI: */ 8687 /* used by GUI: */
8688 $_def_xshape 8688 $_def_xshape
8689 8689
8690 #if defined(HAVE_GL) || defined(HAVE_X11) || defined(HAVE_XV) 8690 #if defined(CONFIG_GL) || defined(HAVE_X11) || defined(HAVE_XV)
8691 #define X11_FULLSCREEN 1 8691 #define X11_FULLSCREEN 1
8692 #endif 8692 #endif
8693 8693
8694 #endif /* MPLAYER_CONFIG_H */ 8694 #endif /* MPLAYER_CONFIG_H */
8695 EOF 8695 EOF