--- a/configure.in Sun May 30 20:06:30 2010 +0530
+++ b/configure.in Mon May 31 13:27:27 2010 +0530
@@ -1128,16 +1128,13 @@
])
if test x$have_xrandr_h_hdr = xyes; then
if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
- echo "-- dynamic libXrender -> $xrender_lib"
echo "-- dynamic libXrandr -> $xrandr_lib"
- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib")
definitely_enable_video_x11_xrandr=yes
else
- AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
AC_CHECK_LIB(Xrandr, XRRQueryExtension, have_xrandr_lib=yes)
- if test x$have_xrender_lib = xyes && test x$have_xrandr_lib = xyes ; then
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr -lXrender"
+ if test x$have_xrandr_lib = xyes ; then
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr"
definitely_enable_video_x11_xrandr=yes
fi
fi
@@ -1199,6 +1196,32 @@
if test x$definitely_enable_video_x11_scrnsaver = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER)
fi
+ AC_ARG_ENABLE(video-x11-xrender,
+AC_HELP_STRING([--enable-video-x11-xrender], [enable X11 Xrender extension [[default=yes]]]),
+ , enable_video_x11_xrender=yes)
+ if test x$enable_video_x11_xrender = xyes; then
+ AC_CHECK_HEADER(X11/extensions/Xrender.h,
+ have_xrender_h_hdr=yes,
+ have_xrender_h_hdr=no,
+ [#include <X11/Xlib.h>
+ ])
+ if test x$have_xrender_h_hdr = xyes; then
+ if test x$enable_x11_shared = xyes && test x$xrender_lib != x ; then
+ echo "-- dynamic libXrender -> $xrender_lib"
+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
+ definitely_enable_video_x11_xrender=yes
+ else
+ AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
+ if test x$have_xrender_lib = xyes ; then
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrender"
+ definitely_enable_video_x11_xrender=yes
+ fi
+ fi
+ fi
+ fi
+ if test x$definitely_enable_video_x11_xrender = xyes; then
+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRENDER)
+ fi
AC_ARG_ENABLE(render-x11,
AC_HELP_STRING([--enable-render-x11], [enable the X11 render driver [[default=yes]]]),