Mercurial > sdl-ios-xcode

comparison configure.in @ 5186:227d81a4b66c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed a bunch of X11 support that we no longer need.
author Sam Lantinga <slouken@libsdl.org>
date Fri, 04 Feb 2011 19:18:08 -0800
parents fb424691cfc7
children 164f20ba08eb
comparison
equal deleted inserted replaced
5185:073b86030262 5186:227d81a4b66c
1116 CFLAGS="$CFLAGS $X_CFLAGS" 1116 CFLAGS="$CFLAGS $X_CFLAGS"
1117 LDFLAGS="$LDFLAGS $X_LIBS" 1117 LDFLAGS="$LDFLAGS $X_LIBS"
1118 1118
1119 AC_DEFINE(SDL_VIDEO_DRIVER_X11) 1119 AC_DEFINE(SDL_VIDEO_DRIVER_X11)
1120 SOURCES="$SOURCES $srcdir/src/video/x11/*.c" 1120 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
1121 SOURCES="$SOURCES $srcdir/src/video/Xext/XmuStdCmap/*.c"
1122 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" 1121 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
1123 1122
1124 if test x$enable_x11_shared = xmaybe; then 1123 if test x$enable_x11_shared = xmaybe; then
1125 enable_x11_shared=$x11_symbols_private 1124 enable_x11_shared=$x11_symbols_private
1126 fi 1125 fi
1258 fi 1257 fi
1259 fi 1258 fi
1260 fi 1259 fi
1261 if test x$definitely_enable_video_x11_scrnsaver = xyes; then 1260 if test x$definitely_enable_video_x11_scrnsaver = xyes; then
1262 AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER) 1261 AC_DEFINE(SDL_VIDEO_DRIVER_X11_SCRNSAVER)
1263 fi
1264 AC_ARG_ENABLE(video-x11-xrender,
1265 AC_HELP_STRING([--enable-video-x11-xrender], [enable X11 Xrender extension [[default=yes]]]),
1266 , enable_video_x11_xrender=yes)
1267 if test x$enable_video_x11_xrender = xyes; then
1268 AC_CHECK_HEADER(X11/extensions/Xrender.h,
1269 have_xrender_h_hdr=yes,
1270 have_xrender_h_hdr=no,
1271 [#include <X11/Xlib.h>
1272 ])
1273 if test x$have_xrender_h_hdr = xyes; then
1274 if test x$enable_x11_shared = xyes && test x$xrender_lib != x ; then
1275 echo "-- dynamic libXrender -> $xrender_lib"
1276 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
1277 definitely_enable_video_x11_xrender=yes
1278 else
1279 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
1280 if test x$have_xrender_lib = xyes ; then
1281 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrender"
1282 definitely_enable_video_x11_xrender=yes
1283 fi
1284 fi
1285 fi
1286 fi
1287 if test x$definitely_enable_video_x11_xrender = xyes; then
1288 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRENDER)
1289 fi
1290 AC_ARG_ENABLE(video-x11-xdamage-xfixes,
1291 AC_HELP_STRING([--enable-video-x11-xdamage-xfixes], [enable X11 Xdamage and Xfixes extensions [[default=yes]]]),
1292 , enable_video_x11_xdamage=yes)
1293 if test x$enable_video_x11_xdamage = xyes && test x$definitely_enable_video_x11_xrender = xyes ; then
1294 AC_CHECK_HEADER(X11/extensions/Xdamage.h,
1295 have_xdamage_h_hdr=yes,
1296 have_xdamage_h_hdr=no,
1297 [#include <X11/Xlib.h>
1298 ])
1299 AC_CHECK_HEADER(X11/extensions/Xfixes.h,
1300 have_xfixes_h_hdr=yes,
1301 have_xfixes_h_hdr=no,
1302 [#include <X11/Xlib.h>
1303 ])
1304 if test x$have_xdamage_h_hdr = xyes && test x$have_xfixes_h_hdr = xyes ; then
1305 if test x$enable_x11_shared = xyes && test x$xdamage_lib != x && test x$xfixes_lib != x ; then
1306 echo "-- dynamic libXdamage -> $xdamage_lib"
1307 echo "-- dynamic libXfixes -> $xfixes_lib"
1308 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XDAMAGE, "$xdamage_lib")
1309 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XFIXES, "$xfixes_lib")
1310 definitely_enable_video_x11_xdamage=yes
1311 definitely_enable_video_x11_xfixes=yes
1312 else
1313 AC_CHECK_LIB(Xdamage, XDamageQueryExtension, have_xdamage_lib=yes)
1314 AC_CHECK_LIB(Xfixes, XFixesQueryExtension, have_xfixes_lib=yes)
1315 if test x$have_xdamage_lib = xyes && test x$have_xfixes_lib = xyes ; then
1316 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXdamage -lXfixes"
1317 definitely_enable_video_x11_xdamage=yes
1318 definitely_enable_video_x11_xfixes=yes
1319 fi
1320 fi
1321 fi
1322 fi
1323 if test x$definitely_enable_video_x11_xdamage = xyes && test x$definitely_enable_video_x11_xfixes = xyes ; then
1324 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XDAMAGE)
1325 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XFIXES)
1326 fi 1262 fi
1327 fi 1263 fi
1328 fi 1264 fi
1329 } 1265 }
1330 1266