Mercurial > mplayer.hg

comparison configure @ 32342:b5aa0248bdc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify some X11 checks with the help of statement_check_broken().
author diego
date Sun, 03 Oct 2010 13:49:57 +0000
parents 541a774ce8e4
children 3930b52e38d2
comparison
equal deleted inserted replaced
32341:eff60552602b 32342:b5aa0248bdc2
4307 #include <X11/Xatom.h> 4307 #include <X11/Xatom.h>
4308 #include <X11/extensions/dpms.h> 4308 #include <X11/extensions/dpms.h>
4309 int main(void) { DPMSQueryExtension(0, 0, 0); return 0; } 4309 int main(void) { DPMSQueryExtension(0, 0, 0); return 0; }
4310 EOF 4310 EOF
4311 cc_check -lXdpms && _xdpms3=yes 4311 cc_check -lXdpms && _xdpms3=yes
4312 cat > $TMPC <<EOF 4312 statement_check_broken X11/Xlib.h X11/extensions/dpms.h 'DPMSQueryExtension(0, 0, 0)' -lXext && _xdpms4=yes
4313 #include <X11/Xlib.h>
4314 #include <X11/extensions/dpms.h>
4315 int main(void) { DPMSQueryExtension(0, 0, 0); return 0; }
4316 EOF
4317 cc_check -lXext && _xdpms4=yes
4318 fi 4313 fi
4319 if test "$_xdpms4" = yes ; then 4314 if test "$_xdpms4" = yes ; then
4320 def_xdpms='#define CONFIG_XDPMS 1' 4315 def_xdpms='#define CONFIG_XDPMS 1'
4321 res_comment="using Xdpms 4" 4316 res_comment="using Xdpms 4"
4322 echores "yes" 4317 echores "yes"
4331 fi 4326 fi
4332 4327
4333 4328
4334 echocheck "Xv" 4329 echocheck "Xv"
4335 if test "$_xv" = auto ; then 4330 if test "$_xv" = auto ; then
4336 cat > $TMPC <<EOF
4337 #include <X11/Xlib.h>
4338 #include <X11/extensions/Xvlib.h>
4339 int main(void) {
4340 XvGetPortAttribute(0, 0, 0, 0);
4341 XvQueryPortAttributes(0, 0, 0);
4342 return 0; }
4343 EOF
4344 _xv=no 4331 _xv=no
4345 cc_check -lXv && _xv=yes 4332 statement_check_broken X11/Xlib.h X11/extensions/Xvlib.h 'XvGetPortAttribute(0, 0, 0, 0)' -lXv && _xv=yes
4346 fi 4333 fi
4347 4334
4348 if test "$_xv" = yes ; then 4335 if test "$_xv" = yes ; then
4349 def_xv='#define CONFIG_XV 1' 4336 def_xv='#define CONFIG_XV 1'
4350 libs_mplayer="$libs_mplayer -lXv" 4337 libs_mplayer="$libs_mplayer -lXv"
4430 # named 'X extensions' or something similar. 4417 # named 'X extensions' or something similar.
4431 # This check may be useful for future mplayer versions (to change resolution) 4418 # This check may be useful for future mplayer versions (to change resolution)
4432 # If you run into problems, remove '-lXxf86vm'. 4419 # If you run into problems, remove '-lXxf86vm'.
4433 echocheck "Xxf86vm" 4420 echocheck "Xxf86vm"
4434 if test "$_vm" = auto ; then 4421 if test "$_vm" = auto ; then
4435 cat > $TMPC <<EOF
4436 #include <X11/Xlib.h>
4437 #include <X11/extensions/xf86vmode.h>
4438 int main(void) { XF86VidModeQueryExtension(0, 0, 0); return 0; }
4439 EOF
4440 _vm=no 4422 _vm=no
4441 cc_check -lXxf86vm && _vm=yes 4423 statement_check_broken X11/Xlib.h X11/extensions/xf86vmode.h 'XF86VidModeQueryExtension(0, 0, 0)' -lXxf86vm && _vm=yes
4442 fi 4424 fi
4443 if test "$_vm" = yes ; then 4425 if test "$_vm" = yes ; then
4444 def_vm='#define CONFIG_XF86VM 1' 4426 def_vm='#define CONFIG_XF86VM 1'
4445 libs_mplayer="$libs_mplayer -lXxf86vm" 4427 libs_mplayer="$libs_mplayer -lXxf86vm"
4446 else 4428 else
4468 fi 4450 fi
4469 echores "$_xf86keysym" 4451 echores "$_xf86keysym"
4470 4452
4471 echocheck "DGA" 4453 echocheck "DGA"
4472 if test "$_dga2" = auto && test "$_x11" = yes ; then 4454 if test "$_dga2" = auto && test "$_x11" = yes ; then
4473 cat > $TMPC << EOF
4474 #include <X11/Xlib.h>
4475 #include <X11/extensions/xf86dga.h>
4476 int main(void) { XDGASetViewport(0, 0, 0, 0, 0); return 0; }
4477 EOF
4478 _dga2=no 4455 _dga2=no
4479 cc_check -lXxf86dga && _dga2=yes 4456 statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes
4480 fi 4457 fi
4481 if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then 4458 if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then
4482 cat > $TMPC << EOF
4483 #include <X11/Xlib.h>
4484 #include <X11/extensions/xf86dga.h>
4485 int main(void) { XF86DGASetViewPort(0, 0, 0, 0); return 0; }
4486 EOF
4487 _dga1=no 4459 _dga1=no
4488 cc_check -lXxf86dga -lXxf86vm && _dga1=yes 4460 statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes
4489 fi 4461 fi
4490 4462
4491 _dga=no 4463 _dga=no
4492 def_dga='#undef CONFIG_DGA' 4464 def_dga='#undef CONFIG_DGA'
4493 def_dga1='#undef CONFIG_DGA1' 4465 def_dga1='#undef CONFIG_DGA1'