We're no longer doing compile checks on the X11 extensions which we include.
authorSam Lantinga <slouken@libsdl.org>
Tue, 31 Jan 2006 19:09:09 +0000
changeset 13071c775d9abd2c
parent 1306 0c105755b110
child 1308 ce64900b4a47
We're no longer doing compile checks on the X11 extensions which we include.
(Resolves bug #114)
configure.in
     1.1 --- a/configure.in	Tue Jan 31 18:39:32 2006 +0000
     1.2 +++ b/configure.in	Tue Jan 31 19:09:09 2006 +0000
     1.3 @@ -654,155 +654,63 @@
     1.4              VIDEO_SUBDIRS="$VIDEO_SUBDIRS x11"
     1.5              VIDEO_DRIVERS="$VIDEO_DRIVERS x11/libvideo_x11.la"
     1.6  
     1.7 +            AC_ARG_ENABLE(dga,
     1.8 +[  --enable-dga            allow use of X11 DGA code [default=yes]],
     1.9 +                          , enable_dga=yes)
    1.10 +            if test x$enable_dga = xyes; then
    1.11 +                VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
    1.12 +                VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
    1.13 +            fi
    1.14 +            AC_ARG_ENABLE(video-dga,
    1.15 +[  --enable-video-dga      use DGA 2.0 video driver [default=yes]],
    1.16 +                  , enable_video_dga=yes)
    1.17 +            if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
    1.18 +                CFLAGS="$CFLAGS -DENABLE_DGA"
    1.19 +                VIDEO_SUBDIRS="$VIDEO_SUBDIRS dga"
    1.20 +                VIDEO_DRIVERS="$VIDEO_DRIVERS dga/libvideo_dga.la"
    1.21 +            fi
    1.22 +            AC_ARG_ENABLE(video-x11-dgamouse,
    1.23 +[  --enable-video-x11-dgamouse  use X11 DGA for mouse events [default=yes]],
    1.24 +                          , enable_video_x11_dgamouse=yes)
    1.25 +            if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then
    1.26 +                CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE"
    1.27 +            fi
    1.28              AC_ARG_ENABLE(video-x11-vm,
    1.29  [  --enable-video-x11-vm   use X11 VM extension for fullscreen [default=yes]],
    1.30                            , enable_video_x11_vm=yes)
    1.31              if test x$enable_video_x11_vm = xyes; then
    1.32 -                AC_MSG_CHECKING(for XFree86 VidMode 1.0 support)
    1.33 -                video_x11_vm=no
    1.34 -                AC_TRY_COMPILE([
    1.35 -                 #include <X11/Xlib.h>
    1.36 -                 #include <XFree86/extensions/xf86vmode.h>
    1.37 -                ],[
    1.38 -                ],[
    1.39 -                video_x11_vm=yes
    1.40 -                ])
    1.41 -                AC_MSG_RESULT($video_x11_vm)
    1.42 -                if test x$video_x11_vm = xyes; then
    1.43 -                    CFLAGS="$CFLAGS -DXFREE86_VM"
    1.44 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
    1.45 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
    1.46 -                    AC_MSG_CHECKING(for XFree86 VidMode gamma support)
    1.47 -                    video_x11_vmgamma=no
    1.48 -                    AC_TRY_COMPILE([
    1.49 -                     #include <X11/Xlib.h>
    1.50 -                     #include <XFree86/extensions/xf86vmode.h>
    1.51 -                    ],[
    1.52 -                     SDL_NAME(XF86VidModeGamma) gamma;
    1.53 -                    ],[
    1.54 -                    video_x11_vmgamma=yes
    1.55 -                    ])
    1.56 -                    AC_MSG_RESULT($video_x11_vmgamma)
    1.57 -                    if test x$video_x11_vmgamma = xyes; then
    1.58 -                        CFLAGS="$CFLAGS -DXFREE86_VMGAMMA"
    1.59 -                    fi
    1.60 -                fi
    1.61 -            fi
    1.62 -            AC_ARG_ENABLE(dga,
    1.63 -[  --enable-dga            allow use of X11 DGA code [default=yes]],
    1.64 -                          , enable_dga=yes)
    1.65 -            AC_ARG_ENABLE(video-x11-dgamouse,
    1.66 -[  --enable-video-x11-dgamouse  use X11 DGA for mouse events [default=yes]],
    1.67 -                          , enable_video_x11_dgamouse=yes)
    1.68 -            if test x$enable_dga = xyes; then
    1.69 -                AC_MSG_CHECKING(for XFree86 DGA 1.0 support)
    1.70 -                video_x11_dga=no
    1.71 -                AC_TRY_COMPILE([
    1.72 -                 #include <X11/Xlib.h>
    1.73 -                 #include <XFree86/extensions/xf86dga.h>
    1.74 -                ],[
    1.75 -                ],[
    1.76 -                video_x11_dga=yes
    1.77 -                ])
    1.78 -                AC_MSG_RESULT($video_x11_dga)
    1.79 -                if test x$video_x11_dga = xyes; then
    1.80 -                    CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE"
    1.81 -                    if test x$enable_video_x11_dgamouse = xyes; then
    1.82 -                        CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
    1.83 -                    fi
    1.84 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
    1.85 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
    1.86 -                fi
    1.87 +                CFLAGS="$CFLAGS -DXFREE86_VM -DXFREE86_VMGAMMA"
    1.88 +                VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
    1.89 +                VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
    1.90              fi
    1.91              AC_ARG_ENABLE(video-x11-xv,
    1.92  [  --enable-video-x11-xv   use X11 XvImage extension for video [default=yes]],
    1.93                            , enable_video_x11_xv=yes)
    1.94              if test x$enable_video_x11_xv = xyes; then
    1.95 -                AC_MSG_CHECKING(for XFree86 XvImage support)
    1.96 -                video_x11_xv=no
    1.97 -                AC_TRY_COMPILE([
    1.98 -                 #include <X11/Xlib.h>
    1.99 -                 #include <sys/ipc.h>
   1.100 -                 #include <sys/shm.h>
   1.101 -                 #include <X11/extensions/XShm.h>
   1.102 -                 #include <XFree86/extensions/Xvlib.h>
   1.103 -                ],[
   1.104 -                 SDL_NAME(XvImage) *image;
   1.105 -                ],[
   1.106 -                video_x11_xv=yes
   1.107 -                ])
   1.108 -                AC_MSG_RESULT($video_x11_xv)
   1.109 -                if test x$video_x11_xv = xyes; then
   1.110 -                    CFLAGS="$CFLAGS -DXFREE86_XV"
   1.111 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
   1.112 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
   1.113 -                fi
   1.114 +                CFLAGS="$CFLAGS -DXFREE86_XV"
   1.115 +                VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
   1.116 +                VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
   1.117              fi
   1.118              AC_ARG_ENABLE(video-x11-xinerama,
   1.119  [  --enable-video-x11-xinerama   enable X11 Xinerama support [default=yes]],
   1.120                              , enable_video_x11_xinerama=yes)
   1.121              if test x$enable_video_x11_xinerama = xyes; then
   1.122 -                AC_MSG_CHECKING(for X11 Xinerama support)
   1.123 -                video_x11_xinerama=no
   1.124 -                AC_TRY_COMPILE([
   1.125 -                 #include <X11/Xlib.h>
   1.126 -                 #include <XFree86/extensions/Xinerama.h>
   1.127 -                ],[
   1.128 -                 SDL_NAME(XineramaScreenInfo) *xinerama;
   1.129 -                ],[
   1.130 -                video_x11_xinerama=yes
   1.131 -                ])
   1.132 -                AC_MSG_RESULT($video_x11_xinerama)
   1.133 -                if test x$video_x11_xinerama = xyes; then
   1.134 -                    CFLAGS="$CFLAGS -DHAVE_XINERAMA"
   1.135 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
   1.136 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
   1.137 -                fi
   1.138 +                CFLAGS="$CFLAGS -DHAVE_XINERAMA"
   1.139 +                VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
   1.140 +                VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
   1.141              fi
   1.142              AC_ARG_ENABLE(video-x11-xme,
   1.143  [  --enable-video-x11-xme  enable Xi Graphics XME for fullscreen [default=yes]],
   1.144                              , enable_video_x11_xme=yes)
   1.145              if test x$enable_video_x11_xme = xyes; then
   1.146 -                AC_MSG_CHECKING(for Xi Graphics XiGMiscExtension support)
   1.147 -                video_x11_xme=yes
   1.148 -                AC_MSG_RESULT($video_x11_xme)
   1.149 -                if test x$video_x11_xme = xyes; then
   1.150 -                    CFLAGS="$CFLAGS -DHAVE_XIGXME"
   1.151 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
   1.152 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
   1.153 -                fi
   1.154 +                CFLAGS="$CFLAGS -DHAVE_XIGXME"
   1.155 +                VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
   1.156 +                VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
   1.157              fi
   1.158          fi
   1.159      fi
   1.160  }
   1.161  
   1.162 -dnl Find the X11 DGA 2.0 include and library directories
   1.163 -CheckDGA()
   1.164 -{
   1.165 -    AC_ARG_ENABLE(video-dga,
   1.166 -[  --enable-video-dga      use DGA 2.0 video driver [default=yes]],
   1.167 -                  , enable_video_dga=yes)
   1.168 -    if test x$video_x11_dga = xyes -a x$enable_video_dga = xyes; then
   1.169 -        save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -Isrc/video"
   1.170 -        AC_MSG_CHECKING(for XFree86 DGA 2.0 support)
   1.171 -        video_x11_dga2=no
   1.172 -        AC_TRY_COMPILE([
   1.173 -         #include <X11/Xlib.h>
   1.174 -         #include <XFree86/extensions/xf86dga.h>
   1.175 -        ],[
   1.176 -         SDL_NAME(XDGAEvent) xevent;
   1.177 -        ],[
   1.178 -        video_x11_dga2=yes
   1.179 -        ])
   1.180 -        AC_MSG_RESULT($video_x11_dga2)
   1.181 -        if test x$video_x11_dga2 = xyes; then
   1.182 -            CFLAGS="$CFLAGS -DENABLE_DGA"
   1.183 -            VIDEO_SUBDIRS="$VIDEO_SUBDIRS dga"
   1.184 -            VIDEO_DRIVERS="$VIDEO_DRIVERS dga/libvideo_dga.la"
   1.185 -        fi
   1.186 -    fi
   1.187 -}
   1.188 -
   1.189  CheckPHOTON()
   1.190  {
   1.191      AC_ARG_ENABLE(video-photon,
   1.192 @@ -2087,7 +1995,6 @@
   1.193          CheckNAS
   1.194          CheckX11
   1.195          CheckNANOX
   1.196 -        CheckDGA
   1.197          CheckFBCON
   1.198          CheckDirectFB
   1.199          CheckPS2GS
   1.200 @@ -2175,7 +2082,6 @@
   1.201          CheckESD
   1.202          CheckNAS
   1.203          CheckX11
   1.204 -        CheckDGA
   1.205          CheckSVGA
   1.206          CheckAAlib
   1.207          CheckOpenGLX11
   1.208 @@ -2221,7 +2127,6 @@
   1.209          CheckESD
   1.210          CheckNAS
   1.211          CheckX11
   1.212 -        CheckDGA
   1.213          CheckSVGA
   1.214          CheckAAlib
   1.215          CheckOpenGLX11