Mercurial > sdl-ios-xcode

comparison configure.in @ 4577:87a2d87786d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified configure.in to allow building with Xrender. Fixed all problems that prevented compilation. Builds fine now :)
author Sunny Sachanandani <sunnysachanandani@gmail.com>
date Mon, 31 May 2010 13:27:27 +0530
parents be387681d876
children d7535d7a40ea
comparison
equal deleted inserted replaced
4576:2b98162b536a 4577:87a2d87786d4
1126 have_xrandr_h_hdr=no, 1126 have_xrandr_h_hdr=no,
1127 [#include <X11/Xlib.h> 1127 [#include <X11/Xlib.h>
1128 ]) 1128 ])
1129 if test x$have_xrandr_h_hdr = xyes; then 1129 if test x$have_xrandr_h_hdr = xyes; then
1130 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then 1130 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
1131 echo "-- dynamic libXrender -> $xrender_lib"
1132 echo "-- dynamic libXrandr -> $xrandr_lib" 1131 echo "-- dynamic libXrandr -> $xrandr_lib"
1133 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
1134 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib") 1132 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib")
1135 definitely_enable_video_x11_xrandr=yes 1133 definitely_enable_video_x11_xrandr=yes
1136 else 1134 else
1137 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
1138 AC_CHECK_LIB(Xrandr, XRRQueryExtension, have_xrandr_lib=yes) 1135 AC_CHECK_LIB(Xrandr, XRRQueryExtension, have_xrandr_lib=yes)
1139 if test x$have_xrender_lib = xyes && test x$have_xrandr_lib = xyes ; then 1136 if test x$have_xrandr_lib = xyes ; then
1140 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr -lXrender" 1137 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr"
1141 definitely_enable_video_x11_xrandr=yes 1138 definitely_enable_video_x11_xrandr=yes
1142 fi 1139 fi
1143 fi 1140 fi
1144 fi 1141 fi
1145 fi 1142 fi
1196 fi 1193 fi
1197 fi 1194 fi
1198 fi 1195 fi
1199 if test x$definitely_enable_video_x11_scrnsaver = xyes; then 1196 if test x$definitely_enable_video_x11_scrnsaver = xyes; then
1200 AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER) 1197 AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER)
1198 fi
1199 AC_ARG_ENABLE(video-x11-xrender,
1200 AC_HELP_STRING([--enable-video-x11-xrender], [enable X11 Xrender extension [[default=yes]]]),
1201 , enable_video_x11_xrender=yes)
1202 if test x$enable_video_x11_xrender = xyes; then
1203 AC_CHECK_HEADER(X11/extensions/Xrender.h,
1204 have_xrender_h_hdr=yes,
1205 have_xrender_h_hdr=no,
1206 [#include <X11/Xlib.h>
1207 ])
1208 if test x$have_xrender_h_hdr = xyes; then
1209 if test x$enable_x11_shared = xyes && test x$xrender_lib != x ; then
1210 echo "-- dynamic libXrender -> $xrender_lib"
1211 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
1212 definitely_enable_video_x11_xrender=yes
1213 else
1214 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
1215 if test x$have_xrender_lib = xyes ; then
1216 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrender"
1217 definitely_enable_video_x11_xrender=yes
1218 fi
1219 fi
1220 fi
1221 fi
1222 if test x$definitely_enable_video_x11_xrender = xyes; then
1223 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRENDER)
1201 fi 1224 fi
1202 1225
1203 AC_ARG_ENABLE(render-x11, 1226 AC_ARG_ENABLE(render-x11,
1204 AC_HELP_STRING([--enable-render-x11], [enable the X11 render driver [[default=yes]]]), 1227 AC_HELP_STRING([--enable-render-x11], [enable the X11 render driver [[default=yes]]]),
1205 , enable_render_x11=yes) 1228 , enable_render_x11=yes)