configure.in
changeset 5183 227d81a4b66c
parent 5154 fb424691cfc7
child 5199 164f20ba08eb
     1.1 --- a/configure.in	Fri Feb 04 18:05:20 2011 -0800
     1.2 +++ b/configure.in	Fri Feb 04 19:18:08 2011 -0800
     1.3 @@ -1118,7 +1118,6 @@
     1.4  
     1.5              AC_DEFINE(SDL_VIDEO_DRIVER_X11)
     1.6              SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
     1.7 -            SOURCES="$SOURCES $srcdir/src/video/Xext/XmuStdCmap/*.c"
     1.8              EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
     1.9  
    1.10              if test x$enable_x11_shared = xmaybe; then
    1.11 @@ -1261,69 +1260,6 @@
    1.12              if test x$definitely_enable_video_x11_scrnsaver = xyes; then
    1.13                  AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER)
    1.14              fi
    1.15 -            AC_ARG_ENABLE(video-x11-xrender,
    1.16 -AC_HELP_STRING([--enable-video-x11-xrender], [enable X11 Xrender extension [[default=yes]]]),
    1.17 -                            , enable_video_x11_xrender=yes)
    1.18 -            if test x$enable_video_x11_xrender = xyes; then
    1.19 -                AC_CHECK_HEADER(X11/extensions/Xrender.h,
    1.20 -                                have_xrender_h_hdr=yes,
    1.21 -                                have_xrender_h_hdr=no,
    1.22 -                                [#include <X11/Xlib.h>
    1.23 -                                ])
    1.24 -                if test x$have_xrender_h_hdr = xyes; then
    1.25 -                    if test x$enable_x11_shared = xyes && test x$xrender_lib != x ; then
    1.26 -                        echo "-- dynamic libXrender -> $xrender_lib"
    1.27 -                        AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
    1.28 -                        definitely_enable_video_x11_xrender=yes
    1.29 -                    else
    1.30 -                        AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
    1.31 -                        if test x$have_xrender_lib = xyes ; then
    1.32 -                            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrender"
    1.33 -                            definitely_enable_video_x11_xrender=yes
    1.34 -                        fi
    1.35 -                    fi
    1.36 -                fi
    1.37 -            fi
    1.38 -            if test x$definitely_enable_video_x11_xrender = xyes; then
    1.39 -                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRENDER)
    1.40 -            fi
    1.41 -            AC_ARG_ENABLE(video-x11-xdamage-xfixes,
    1.42 -AC_HELP_STRING([--enable-video-x11-xdamage-xfixes], [enable X11 Xdamage and Xfixes extensions [[default=yes]]]),
    1.43 -                            , enable_video_x11_xdamage=yes)
    1.44 -            if test x$enable_video_x11_xdamage = xyes && test x$definitely_enable_video_x11_xrender = xyes ; then
    1.45 -                AC_CHECK_HEADER(X11/extensions/Xdamage.h,
    1.46 -                                have_xdamage_h_hdr=yes,
    1.47 -                                have_xdamage_h_hdr=no,
    1.48 -                                [#include <X11/Xlib.h>
    1.49 -                                ])
    1.50 -                AC_CHECK_HEADER(X11/extensions/Xfixes.h,
    1.51 -                                have_xfixes_h_hdr=yes,
    1.52 -                                have_xfixes_h_hdr=no,
    1.53 -                                [#include <X11/Xlib.h>
    1.54 -                                ])
    1.55 -                if test x$have_xdamage_h_hdr = xyes && test x$have_xfixes_h_hdr = xyes ; then
    1.56 -                    if test x$enable_x11_shared = xyes && test x$xdamage_lib != x && test x$xfixes_lib != x ; then
    1.57 -                        echo "-- dynamic libXdamage -> $xdamage_lib"
    1.58 -                        echo "-- dynamic libXfixes -> $xfixes_lib"
    1.59 -                        AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XDAMAGE, "$xdamage_lib")
    1.60 -                        AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XFIXES, "$xfixes_lib")
    1.61 -                        definitely_enable_video_x11_xdamage=yes
    1.62 -                        definitely_enable_video_x11_xfixes=yes
    1.63 -                    else
    1.64 -                        AC_CHECK_LIB(Xdamage, XDamageQueryExtension, have_xdamage_lib=yes)
    1.65 -                        AC_CHECK_LIB(Xfixes, XFixesQueryExtension, have_xfixes_lib=yes)
    1.66 -                        if test x$have_xdamage_lib = xyes && test x$have_xfixes_lib = xyes ; then
    1.67 -                            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXdamage -lXfixes"
    1.68 -                            definitely_enable_video_x11_xdamage=yes
    1.69 -                            definitely_enable_video_x11_xfixes=yes
    1.70 -                        fi
    1.71 -                    fi
    1.72 -                fi
    1.73 -            fi
    1.74 -            if test x$definitely_enable_video_x11_xdamage = xyes && test x$definitely_enable_video_x11_xfixes = xyes ; then
    1.75 -                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XDAMAGE)
    1.76 -                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XFIXES)
    1.77 -            fi
    1.78          fi
    1.79      fi
    1.80  }