Mercurial > sdl-ios-xcode

comparison configure.in @ 4618:844b5ef4b149

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged Sunny's XRender changes from SDL-gsoc2010_xrender
author Sam Lantinga <slouken@libsdl.org>
date Wed, 28 Jul 2010 00:54:23 -0700
parents e1664f94f026 d7535d7a40ea
children 1c562caa9123
comparison
equal deleted inserted replaced
4569:e1664f94f026 4618:844b5ef4b149
1053 x11ext_lib=[`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`] 1053 x11ext_lib=[`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1054 xrender_lib=[`find_lib "libXrender.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`] 1054 xrender_lib=[`find_lib "libXrender.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1055 xrandr_lib=[`find_lib "libXrandr.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`] 1055 xrandr_lib=[`find_lib "libXrandr.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1056 xinput_lib=[`find_lib "libXi.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`] 1056 xinput_lib=[`find_lib "libXi.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1057 xss_lib=[`find_lib "libXss.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`] 1057 xss_lib=[`find_lib "libXss.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1058 xdamage_lib=[`find_lib "libXdamage.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1059 xfixes_lib=[`find_lib "libXfixes.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
1058 ;; 1060 ;;
1059 esac 1061 esac
1060 1062
1061 if test x$ac_cv_func_shmat != xyes; then 1063 if test x$ac_cv_func_shmat != xyes; then
1062 X_CFLAGS="$X_CFLAGS -DNO_SHARED_MEMORY" 1064 X_CFLAGS="$X_CFLAGS -DNO_SHARED_MEMORY"
1126 have_xrandr_h_hdr=no, 1128 have_xrandr_h_hdr=no,
1127 [#include <X11/Xlib.h> 1129 [#include <X11/Xlib.h>
1128 ]) 1130 ])
1129 if test x$have_xrandr_h_hdr = xyes; then 1131 if test x$have_xrandr_h_hdr = xyes; then
1130 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then 1132 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" 1133 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") 1134 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib")
1135 definitely_enable_video_x11_xrandr=yes 1135 definitely_enable_video_x11_xrandr=yes
1136 else 1136 else
1137 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
1138 AC_CHECK_LIB(Xrandr, XRRQueryExtension, have_xrandr_lib=yes) 1137 AC_CHECK_LIB(Xrandr, XRRQueryExtension, have_xrandr_lib=yes)
1139 if test x$have_xrender_lib = xyes && test x$have_xrandr_lib = xyes ; then 1138 if test x$have_xrandr_lib = xyes ; then
1140 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr -lXrender" 1139 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr"
1141 definitely_enable_video_x11_xrandr=yes 1140 definitely_enable_video_x11_xrandr=yes
1142 fi 1141 fi
1143 fi 1142 fi
1144 fi 1143 fi
1145 fi 1144 fi
1197 fi 1196 fi
1198 fi 1197 fi
1199 if test x$definitely_enable_video_x11_scrnsaver = xyes; then 1198 if test x$definitely_enable_video_x11_scrnsaver = xyes; then
1200 AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER) 1199 AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER)
1201 fi 1200 fi
1202 1201 AC_ARG_ENABLE(video-x11-xrender,
1202 AC_HELP_STRING([--enable-video-x11-xrender], [enable X11 Xrender extension [[default=yes]]]),
1203 , enable_video_x11_xrender=yes)
1204 if test x$enable_video_x11_xrender = xyes; then
1205 AC_CHECK_HEADER(X11/extensions/Xrender.h,
1206 have_xrender_h_hdr=yes,
1207 have_xrender_h_hdr=no,
1208 [#include <X11/Xlib.h>
1209 ])
1210 if test x$have_xrender_h_hdr = xyes; then
1211 if test x$enable_x11_shared = xyes && test x$xrender_lib != x ; then
1212 echo "-- dynamic libXrender -> $xrender_lib"
1213 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
1214 definitely_enable_video_x11_xrender=yes
1215 else
1216 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
1217 if test x$have_xrender_lib = xyes ; then
1218 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrender"
1219 definitely_enable_video_x11_xrender=yes
1220 fi
1221 fi
1222 fi
1223 fi
1224 if test x$definitely_enable_video_x11_xrender = xyes; then
1225 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRENDER)
1226 fi
1227 AC_ARG_ENABLE(video-x11-xdamage-xfixes,
1228 AC_HELP_STRING([--enable-video-x11-xdamage-xfixes], [enable X11 Xdamage and Xfixes extensions [[default=yes]]]),
1229 , enable_video_x11_xdamage=yes)
1230 if test x$enable_video_x11_xdamage = xyes && test x$definitely_enable_video_x11_xrender = xyes ; then
1231 AC_CHECK_HEADER(X11/extensions/Xdamage.h,
1232 have_xdamage_h_hdr=yes,
1233 have_xdamage_h_hdr=no,
1234 [#include <X11/Xlib.h>
1235 ])
1236 AC_CHECK_HEADER(X11/extensions/Xfixes.h,
1237 have_xfixes_h_hdr=yes,
1238 have_xfixes_h_hdr=no,
1239 [#include <X11/Xlib.h>
1240 ])
1241 if test x$have_xdamage_h_hdr = xyes && test x$have_xfixes_h_hdr = xyes ; then
1242 if test x$enable_x11_shared = xyes && test x$xdamage_lib != x && test x$xfixes_lib != x ; then
1243 echo "-- dynamic libXdamage -> $xdamage_lib"
1244 echo "-- dynamic libXfixes -> $xfixes_lib"
1245 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XDAMAGE, "$xdamage_lib")
1246 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XFIXES, "$xfixes_lib")
1247 definitely_enable_video_x11_xdamage=yes
1248 definitely_enable_video_x11_xfixes=yes
1249 else
1250 AC_CHECK_LIB(Xdamage, XDamageQueryExtension, have_xdamage_lib=yes)
1251 AC_CHECK_LIB(Xfixes, XFixesQueryExtension, have_xfixes_lib=yes)
1252 if test x$have_xdamage_lib = xyes && test x$have_xfixes_lib = xyes ; then
1253 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXdamage -lXfixes"
1254 definitely_enable_video_x11_xdamage=yes
1255 definitely_enable_video_x11_xfixes=yes
1256 fi
1257 fi
1258 fi
1259 fi
1260 if test x$definitely_enable_video_x11_xdamage = xyes && test x$definitely_enable_video_x11_xfixes = xyes ; then
1261 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XDAMAGE)
1262 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XFIXES)
1263 fi
1203 AC_ARG_ENABLE(render-x11, 1264 AC_ARG_ENABLE(render-x11,
1204 AC_HELP_STRING([--enable-render-x11], [enable the X11 render driver [[default=yes]]]), 1265 AC_HELP_STRING([--enable-render-x11], [enable the X11 render driver [[default=yes]]]),
1205 , enable_render_x11=yes) 1266 , enable_render_x11=yes)
1206 if test x$enable_render_x11 = xyes; then 1267 if test x$enable_render_x11 = xyes; then
1207 AC_DEFINE(SDL_VIDEO_RENDER_X11) 1268 AC_DEFINE(SDL_VIDEO_RENDER_X11)