diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-05-05 10:25:17 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-06-29 07:02:19 +0300 |
| commit | 30e8f03f2dfa7c94d1f8d9d2948d33f4bbba8820 (patch) | |
| tree | e55ee6f67d04b48c431bb240ebe00de194aa03d6 /configure | |
| parent | a71340bd40a11f0538dcc8130dfbfa5245dc3f08 (diff) | |
| download | mpv-30e8f03f2dfa7c94d1f8d9d2948d33f4bbba8820.tar.bz2 mpv-30e8f03f2dfa7c94d1f8d9d2948d33f4bbba8820.tar.xz | |
configure: handle X11 dependencies at depending checks
Make features depending on X check its availability at their
individual checks rather than having the X11 check disable them if
needed. This makes each individual feature check self-contained, which
is desirable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33371 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -3842,8 +3842,6 @@ else def_x11='#undef CONFIG_X11' novomodules="x11 $novomodules" res_comment="check if the dev(el) packages are installed" - # disable stuff that depends on X - _xv=no ; _xinerama=no ; _vm=no ; _xf86keysym=no ; _vdpau=no fi echores "$_x11" @@ -3891,7 +3889,7 @@ fi echocheck "Xv" -if test "$_xv" = auto ; then +if test "$_xv" = auto && test "$_x11" = yes ; then _xv=no statement_check_broken X11/Xlib.h X11/extensions/Xvlib.h 'XvGetPortAttribute(0, 0, 0, 0)' -lXv && _xv=yes fi @@ -3908,7 +3906,7 @@ echores "$_xv" echocheck "VDPAU" -if test "$_vdpau" = auto ; then +if test "$_vdpau" = auto && test "$_x11" = yes ; then _vdpau=no if test "$_dl" = yes ; then return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 -lvdpau && _vdpau=yes @@ -3926,7 +3924,7 @@ echores "$_vdpau" echocheck "Xinerama" -if test "$_xinerama" = auto ; then +if test "$_xinerama" = auto && test "$_x11" = yes ; then _xinerama=no statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes fi @@ -3946,7 +3944,7 @@ echores "$_xinerama" # This check may be useful for future mplayer versions (to change resolution) # If you run into problems, remove '-lXxf86vm'. echocheck "Xxf86vm" -if test "$_vm" = auto ; then +if test "$_vm" = auto && test "$_x11" = yes ; then _vm=no statement_check_broken X11/Xlib.h X11/extensions/xf86vmode.h 'XF86VidModeQueryExtension(0, 0, 0)' -lXxf86vm && _vm=yes fi @@ -3963,7 +3961,7 @@ echores "$_vm" # has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT # have these new keycodes. echocheck "XF86keysym" -if test "$_xf86keysym" = auto; then +if test "$_xf86keysym" = auto && test "$_x11" = yes ; then _xf86keysym=no return_check X11/XF86keysym.h XF86XK_AudioPause && _xf86keysym=yes fi |