comparison configure @ 19472:dc0ae47ef220

Properly disable tests that depend on X.
author diego
date Mon, 21 Aug 2006 16:24:16 +0000
parents b9d2ceb63777
children 4bae35431365
comparison
equal deleted inserted replaced
19471:9ed5686705a6 19472:dc0ae47ef220
3768 _x11=no 3768 _x11=no
3769 _def_x11='#undef HAVE_X11' 3769 _def_x11='#undef HAVE_X11'
3770 _ld_x11='' 3770 _ld_x11=''
3771 _novomodules="x11 $_novomodules" 3771 _novomodules="x11 $_novomodules"
3772 _res_comment="check if the dev(el) packages are installed" 3772 _res_comment="check if the dev(el) packages are installed"
3773 # disable stuff that depends on X
3774 _xv=no ; _xvmc=no ; _xinerama=no ; _vm=no ; _xf86keysym=no ; _dga=no
3773 fi 3775 fi
3774 echores "$_x11" 3776 echores "$_x11"
3775 3777
3776 3778
3777 echocheck "DPMS" 3779 echocheck "DPMS"
3812 echores "no" 3814 echores "no"
3813 fi 3815 fi
3814 3816
3815 3817
3816 echocheck "Xv" 3818 echocheck "Xv"
3817 if test "$_x11" = yes && test "$_xv" = auto ; then 3819 if test "$_xv" = auto ; then
3818 cat > $TMPC <<EOF 3820 cat > $TMPC <<EOF
3819 #include <X11/Xlib.h> 3821 #include <X11/Xlib.h>
3820 #include <X11/extensions/Xvlib.h> 3822 #include <X11/extensions/Xvlib.h>
3821 int main(void) { 3823 int main(void) {
3822 (void) XvGetPortAttribute(0, 0, 0, 0); 3824 (void) XvGetPortAttribute(0, 0, 0, 0);
3838 fi 3840 fi
3839 echores "$_xv" 3841 echores "$_xv"
3840 3842
3841 3843
3842 echocheck "XvMC" 3844 echocheck "XvMC"
3843 if test "$_x11" = yes && test "$_xv" = yes && test "$_xvmc" != no ; then 3845 if test "$_xv" = yes && test "$_xvmc" != no ; then
3844 _xvmc=no 3846 _xvmc=no
3845 cat > $TMPC <<EOF 3847 cat > $TMPC <<EOF
3846 #include <X11/Xlib.h> 3848 #include <X11/Xlib.h>
3847 #include <X11/extensions/Xvlib.h> 3849 #include <X11/extensions/Xvlib.h>
3848 #include <X11/extensions/XvMClib.h> 3850 #include <X11/extensions/XvMClib.h>
3867 fi 3869 fi
3868 echores "$_xvmc" 3870 echores "$_xvmc"
3869 3871
3870 3872
3871 echocheck "Xinerama" 3873 echocheck "Xinerama"
3872 if test "$_x11" = yes && test "$_xinerama" = auto ; then 3874 if test "$_xinerama" = auto ; then
3873 cat > $TMPC <<EOF 3875 cat > $TMPC <<EOF
3874 #include <X11/Xlib.h> 3876 #include <X11/Xlib.h>
3875 #include <X11/extensions/Xinerama.h> 3877 #include <X11/extensions/Xinerama.h>
3876 int main(void) { (void) XineramaIsActive(0); return 0; } 3878 int main(void) { (void) XineramaIsActive(0); return 0; }
3877 EOF 3879 EOF
3892 # needed for DGA, AFAIK every distribution packages together with DGA stuffs 3894 # needed for DGA, AFAIK every distribution packages together with DGA stuffs
3893 # named 'X extensions' or something similar. 3895 # named 'X extensions' or something similar.
3894 # This check may be useful for future mplayer versions (to change resolution) 3896 # This check may be useful for future mplayer versions (to change resolution)
3895 # If you run into problems, remove '-lXxf86vm'. 3897 # If you run into problems, remove '-lXxf86vm'.
3896 echocheck "Xxf86vm" 3898 echocheck "Xxf86vm"
3897 if test "$_x11" = yes && test "$_vm" = auto ; then 3899 if test "$_vm" = auto ; then
3898 cat > $TMPC <<EOF 3900 cat > $TMPC <<EOF
3899 #include <X11/Xlib.h> 3901 #include <X11/Xlib.h>
3900 #include <X11/extensions/xf86vmode.h> 3902 #include <X11/extensions/xf86vmode.h>
3901 int main(void) { (void) XF86VidModeQueryExtension(0, 0, 0); return 0; } 3903 int main(void) { (void) XF86VidModeQueryExtension(0, 0, 0); return 0; }
3902 EOF 3904 EOF
3916 # has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT 3918 # has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT
3917 # have these new keycodes. 3919 # have these new keycodes.
3918 echocheck "XF86keysym" 3920 echocheck "XF86keysym"
3919 if test "$_xf86keysym" = auto; then 3921 if test "$_xf86keysym" = auto; then
3920 _xf86keysym=no 3922 _xf86keysym=no
3921 if test "$_x11" = yes ; then
3922 cat > $TMPC <<EOF 3923 cat > $TMPC <<EOF
3923 #include <X11/Xlib.h> 3924 #include <X11/Xlib.h>
3924 #include <X11/XF86keysym.h> 3925 #include <X11/XF86keysym.h>
3925 int main(void) { return XF86XK_AudioPause; } 3926 int main(void) { return XF86XK_AudioPause; }
3926 EOF 3927 EOF
3927 cc_check $_ld_x11 && _xf86keysym=yes 3928 cc_check $_ld_x11 && _xf86keysym=yes
3928 fi
3929 fi 3929 fi
3930 if test "$_xf86keysym" = yes ; then 3930 if test "$_xf86keysym" = yes ; then
3931 _def_xf86keysym='#define HAVE_XF86XK 1' 3931 _def_xf86keysym='#define HAVE_XF86XK 1'
3932 else 3932 else
3933 _def_xf86keysym='#undef HAVE_XF86XK' 3933 _def_xf86keysym='#undef HAVE_XF86XK'
3934 fi 3934 fi
3935 echores "$_xf86keysym" 3935 echores "$_xf86keysym"
3936 3936
3937 echocheck "DGA" 3937 echocheck "DGA"
3938 if test "$_x11" = no ; then
3939 _dga=no
3940 fi
3941 # Version 2 is preferred to version 1 if available 3938 # Version 2 is preferred to version 1 if available
3942 if test "$_dga" = auto ; then 3939 if test "$_dga" = auto ; then
3943 cat > $TMPC << EOF 3940 cat > $TMPC << EOF
3944 #include <X11/Xlib.h> 3941 #include <X11/Xlib.h>
3945 #include <X11/extensions/xf86dga.h> 3942 #include <X11/extensions/xf86dga.h>