1.1 --- a/configure.in	Wed May 02 19:21:00 2001 +0000
     1.2 +++ b/configure.in	Thu May 10 18:04:03 2001 +0000
     1.3 @@ -347,7 +347,7 @@
     1.4  CheckNAS()
     1.5  {
     1.6      AC_ARG_ENABLE(nas,
     1.7 -[  --enable-nas		support the NAS audio API [default=yes]],
     1.8 +[  --enable-nas		  support the NAS audio API [default=yes]],
     1.9  		, enable_nas=yes)
    1.10      if test x$enable_audio = xyes -a x$enable_nas = xyes; then
    1.11  	AC_MSG_CHECKING(for NAS audio support)
    1.12 @@ -474,25 +474,30 @@
    1.13                      fi
    1.14                  fi
    1.15              fi
    1.16 +            AC_ARG_ENABLE(dga,
    1.17 +[  --enable-dga            allow use of X11 DGA code [default=yes]],
    1.18 +                          , enable_dga=yes)
    1.19              AC_ARG_ENABLE(video-x11-dgamouse,
    1.20  [  --enable-video-x11-dgamouse  use X11 DGA for mouse events [default=yes]],
    1.21                            , enable_video_x11_dgamouse=yes)
    1.22 -            AC_MSG_CHECKING(for XFree86 DGA 1.0 support)
    1.23 -            video_x11_dga=no
    1.24 -            AC_TRY_COMPILE([
    1.25 -             #include <X11/Xlib.h>
    1.26 -             #include <X11/extensions/xf86dga.h>
    1.27 -            ],[
    1.28 -            ],[
    1.29 -            video_x11_dga=yes
    1.30 -            ])
    1.31 -            AC_MSG_RESULT($video_x11_dga)
    1.32 -            if test x$video_x11_dga = xyes; then
    1.33 -                CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE"
    1.34 -                if test x$enable_video_x11_dgamouse = xyes; then
    1.35 -                    CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
    1.36 +            if test x$enable_dga = xyes; then
    1.37 +                AC_MSG_CHECKING(for XFree86 DGA 1.0 support)
    1.38 +                video_x11_dga=no
    1.39 +                AC_TRY_COMPILE([
    1.40 +                 #include <X11/Xlib.h>
    1.41 +                 #include <X11/extensions/xf86dga.h>
    1.42 +                ],[
    1.43 +                ],[
    1.44 +                video_x11_dga=yes
    1.45 +                ])
    1.46 +                AC_MSG_RESULT($video_x11_dga)
    1.47 +                if test x$video_x11_dga = xyes; then
    1.48 +                    CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE"
    1.49 +                    if test x$enable_video_x11_dgamouse = xyes; then
    1.50 +                        CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
    1.51 +                    fi
    1.52 +                    SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86dga"
    1.53                  fi
    1.54 -                SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86dga"
    1.55              fi
    1.56              AC_ARG_ENABLE(video-x11-xv,
    1.57  [  --enable-video-x11-xv   use X11 XvImage extension for video [default=yes]],
    1.58 @@ -687,7 +692,7 @@
    1.59  CheckDummyVideo()
    1.60  {
    1.61      AC_ARG_ENABLE(video-dummy,
    1.62 -[  --enable-video-dummy   use dummy video driver [default=no]],
    1.63 +[  --enable-video-dummy    use dummy video driver [default=no]],
    1.64                    , enable_video_dummy=no)
    1.65      if test x$enable_video_dummy = xyes; then
    1.66        CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"

     2.1 --- a/docs.html	Wed May 02 19:21:00 2001 +0000
     2.2 +++ b/docs.html	Thu May 10 18:04:03 2001 +0000
     2.3 @@ -16,6 +16,7 @@
     2.4  Major changes since SDL 1.0.0:
     2.5  </H2>
     2.6  <UL>
     2.7 +	<LI> 1.2.1: Added --disable-dga configure option to disable DGA entirely
     2.8  	<LI> 1.2.1: Fixed stuck keys when changing the video mode
     2.9  	<LI> 1.2.1: Fixed double-mouse event bug on Windows using OpenGL
    2.10  	<LI> 1.2.1: Fixed 320x200 video mode on framebuffer console