comparison configure @ 14636:408bcfa575bf

Separate XF86 video mode extension check from XF86 keysym check as XFree 3.x does not have the latter. based on a patch by Trent Piepho <xyzzy at speakeasy dot org>
author diego
date Wed, 02 Feb 2005 14:07:13 +0000
parents a288fcf5eec1
children fdea66294b26
comparison
equal deleted inserted replaced
14635:1c277cafd3b1 14636:408bcfa575bf
159 --disable-setlocale disable setlocale using in mplayer [autodetect] 159 --disable-setlocale disable setlocale using in mplayer [autodetect]
160 --disable-langinfo do not use langinfo [autodetect] 160 --disable-langinfo do not use langinfo [autodetect]
161 --enable-lirc enable LIRC (remote control) support [autodetect] 161 --enable-lirc enable LIRC (remote control) support [autodetect]
162 --enable-lircc enable LIRCCD (LIRC client daemon) input [autodetect] 162 --enable-lircc enable LIRCCD (LIRC client daemon) input [autodetect]
163 --enable-joystick enable joystick support [disable] 163 --enable-joystick enable joystick support [disable]
164 --disable-vm disable support X video mode extensions [autodetect]
165 --disable-xf86keysym disable support for 'multimedia' keys [autodetect]
164 --disable-tv disable TV Interface (tv/dvb grabbers) [enable] 166 --disable-tv disable TV Interface (tv/dvb grabbers) [enable]
165 --disable-tv-v4l disable Video4Linux TV Interface support [autodetect] 167 --disable-tv-v4l disable Video4Linux TV Interface support [autodetect]
166 --disable-tv-v4l2 disable Video4Linux2 TV Interface support [autodetect] 168 --disable-tv-v4l2 disable Video4Linux2 TV Interface support [autodetect]
167 --disable-tv-bsdbt848 disable BSD BT848 Interface support [autodetect] 169 --disable-tv-bsdbt848 disable BSD BT848 Interface support [autodetect]
168 --disable-edl disable EDL (edit decision list) support [enable] 170 --disable-edl disable EDL (edit decision list) support [enable]
1339 _live=auto 1341 _live=auto
1340 _xinerama=auto 1342 _xinerama=auto
1341 _mga=auto 1343 _mga=auto
1342 _xmga=auto 1344 _xmga=auto
1343 _vm=auto 1345 _vm=auto
1346 _xf86keysym=auto
1344 _mlib=auto 1347 _mlib=auto
1345 _sgiaudio=auto 1348 _sgiaudio=auto
1346 _sunaudio=auto 1349 _sunaudio=auto
1347 _alsa=auto 1350 _alsa=auto
1348 _fastmemcpy=yes 1351 _fastmemcpy=yes
1545 --disable-mga) _mga=no ;; 1548 --disable-mga) _mga=no ;;
1546 --enable-xmga) _xmga=yes ;; 1549 --enable-xmga) _xmga=yes ;;
1547 --disable-xmga) _xmga=no ;; 1550 --disable-xmga) _xmga=no ;;
1548 --enable-vm) _vm=yes ;; 1551 --enable-vm) _vm=yes ;;
1549 --disable-vm) _vm=no ;; 1552 --disable-vm) _vm=no ;;
1553 --enable-xf86keysym) _xf86keysym=yes ;;
1554 --disable-xf86keysym) _xf86keysym=no ;;
1550 --enable-mlib) _mlib=yes ;; 1555 --enable-mlib) _mlib=yes ;;
1551 --disable-mlib) _mlib=no ;; 1556 --disable-mlib) _mlib=no ;;
1552 --enable-sunaudio) _sunaudio=yes ;; 1557 --enable-sunaudio) _sunaudio=yes ;;
1553 --disable-sunaudio) _sunaudio=no ;; 1558 --disable-sunaudio) _sunaudio=no ;;
1554 --enable-sgiaudio) _sgiaudio=yes ;; 1559 --enable-sgiaudio) _sgiaudio=yes ;;
3544 # needed for DGA, AFAIK every distribution packages together with DGA stuffs 3549 # needed for DGA, AFAIK every distribution packages together with DGA stuffs
3545 # named 'X extensions' or something similar. 3550 # named 'X extensions' or something similar.
3546 # This check may be useful for future mplayer versions (to change resolution) 3551 # This check may be useful for future mplayer versions (to change resolution)
3547 # If you run into problems, remove '-lXxf86vm'. 3552 # If you run into problems, remove '-lXxf86vm'.
3548 echocheck "Xxf86vm" 3553 echocheck "Xxf86vm"
3549 if test "$_x11" = yes && test "$_vm" != no ; then 3554 if test "$_x11" = yes && test "$_vm" = auto ; then
3550 cat > $TMPC <<EOF 3555 cat > $TMPC <<EOF
3551 #include <X11/Xlib.h> 3556 #include <X11/Xlib.h>
3552 #include <X11/extensions/xf86vmode.h> 3557 #include <X11/extensions/xf86vmode.h>
3553 #include <X11/XF86keysym.h>
3554 int main(void) { (void) XF86VidModeQueryExtension(0, 0, 0); return 0; } 3558 int main(void) { (void) XF86VidModeQueryExtension(0, 0, 0); return 0; }
3555 EOF 3559 EOF
3556 _vm=no 3560 _vm=no
3557 cc_check $_inc_x11 -lXxf86vm $_ld_x11 && _vm=yes 3561 cc_check $_inc_x11 -lXxf86vm $_ld_x11 && _vm=yes
3558 else
3559 _vm=no
3560 fi 3562 fi
3561 if test "$_vm" = yes ; then 3563 if test "$_vm" = yes ; then
3562 _def_vm='#define HAVE_XF86VM 1' 3564 _def_vm='#define HAVE_XF86VM 1'
3563 _ld_vm='-lXxf86vm' 3565 _ld_vm='-lXxf86vm'
3564 else 3566 else
3565 _def_vm='#undef HAVE_XF86VM' 3567 _def_vm='#undef HAVE_XF86VM'
3566 fi 3568 fi
3567 echores "$_vm" 3569 echores "$_vm"
3568 3570
3571 # Check for the presence of special keycodes, like audio control buttons
3572 # that XFree86 might have. Used to be bundled with the xf86vm check, but
3573 # has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT
3574 # have these new keycodes.
3575 echocheck "XF86keysym"
3576 if test "$_xf86keysym" = auto; then
3577 _xf86keysym=no
3578 if test "$_x11" = yes ; then
3579 cat > $TMPC <<EOF
3580 #include <X11/Xlib.h>
3581 #include <X11/XF86keysym.h>
3582 int main(void) { return XF86XK_AudioPause; }
3583 EOF
3584 cc_check $_inc_x11 $_ld_x11 && _xf86keysym=yes
3585 fi
3586 fi
3587 if test "$_xf86keysym" = yes ; then
3588 _def_xf86keysym='#define HAVE_XF86XK 1'
3589 else
3590 _def_xf86keysym='#undef HAVE_XF86XK'
3591 fi
3592 echores "$_xf86keysym"
3569 3593
3570 echocheck "DGA" 3594 echocheck "DGA"
3571 # Version 2 is preferred to version 1 if available 3595 # Version 2 is preferred to version 1 if available
3572 if test "$_dga" = auto ; then 3596 if test "$_dga" = auto ; then
3573 cat > $TMPC << EOF 3597 cat > $TMPC << EOF
7391 #define SCREEN_SIZE_Y 1 7415 #define SCREEN_SIZE_Y 1
7392 $_def_x11 7416 $_def_x11
7393 $_def_xv 7417 $_def_xv
7394 $_def_xvmc 7418 $_def_xvmc
7395 $_def_vm 7419 $_def_vm
7420 $_def_xf86keysym
7396 $_def_xinerama 7421 $_def_xinerama
7397 $_def_gl 7422 $_def_gl
7398 $_def_gl_win32 7423 $_def_gl_win32
7399 $_def_dga 7424 $_def_dga
7400 $_def_dga2 7425 $_def_dga2