Mercurial > sdl-ios-xcode

comparison configure.in @ 2998:d364ee9b9c15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Sun, 04 Jan 2009 20:53:30 +0100 From: Couriersud Subject: SDL1.3 DirectFB patches The attached contains the following directfb changes: - Dynamic loading of libdirectfb.so. This may to turned off as well in configure - Use linux-input by default. May be switched off by environment variable. - Added some code which will use directfb's x11 backend when DISPLAY is set.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 04 Jan 2009 23:43:33 +0000
parents fec0db6c44b7
children b30409e106f2
comparison
equal deleted inserted replaced
2997:e4f025078c1c 2998:d364ee9b9c15
1309 AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=no]]]), 1309 AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=no]]]),
1310 , enable_video_directfb=no) 1310 , enable_video_directfb=no)
1311 if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then 1311 if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then
1312 video_directfb=no 1312 video_directfb=no
1313 1313
1314 DIRECTFB_REQUIRED_VERSION=0.9.15 1314 DIRECTFB_REQUIRED_VERSION=1.0.0
1315 1315
1316 AC_PATH_PROG(DIRECTFBCONFIG, directfb-config, no) 1316 AC_PATH_PROG(DIRECTFBCONFIG, directfb-config, no)
1317 if test x$DIRECTFBCONFIG = xno; then 1317 if test x$DIRECTFBCONFIG = xno; then
1318 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 1318 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1319 AC_MSG_CHECKING(for DirectFB $DIRECTFB_REQUIRED_VERSION support) 1319 AC_MSG_CHECKING(for DirectFB $DIRECTFB_REQUIRED_VERSION support)
1320 if test x$PKG_CONFIG != xno; then 1320 if test x$PKG_CONFIG != xno; then
1321 if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb; then 1321 if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb; then
1322 DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb` 1322 DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb`
1323 DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb` 1323 DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb`
1324 DIRECTFB_PREFIX=`$PKG_CONFIG --variable=prefix directfb`
1324 video_directfb=yes 1325 video_directfb=yes
1325 fi 1326 fi
1326 fi 1327 fi
1327 AC_MSG_RESULT($video_directfb) 1328 AC_MSG_RESULT($video_directfb)
1328 else 1329 else
1332 set -- `directfb-config --version | sed 's/\./ /g'` 1333 set -- `directfb-config --version | sed 's/\./ /g'`
1333 HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` 1334 HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
1334 if test $HAVE_VERSION -ge $NEED_VERSION; then 1335 if test $HAVE_VERSION -ge $NEED_VERSION; then
1335 DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags` 1336 DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
1336 DIRECTFB_LIBS=`$DIRECTFBCONFIG --libs` 1337 DIRECTFB_LIBS=`$DIRECTFBCONFIG --libs`
1338 DIRECTFB_PREFIX=`$DIRECTFBCONFIG --prefix`
1337 video_directfb=yes 1339 video_directfb=yes
1338 fi 1340 fi
1339 AC_MSG_RESULT($video_directfb) 1341 AC_MSG_RESULT($video_directfb)
1340 fi 1342 fi
1341 1343
1342 if test x$video_directfb = xyes; then 1344 if test x$video_directfb = xyes; then
1345 AC_ARG_ENABLE(directfb-shared,
1346 AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[default=yes]]]),
1347 , enable_directfb_shared=yes)
1348
1343 AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB) 1349 AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)
1344 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" 1350 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
1345 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" 1351 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
1346 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" 1352
1353 AC_MSG_CHECKING(for directfb dynamic loading support)
1354 directfb_shared=no
1355 directfb_lib_spec="$DIRECTFB_PREFIX/lib/libdirectfb.so*"
1356 directfb_lib=`ls -- $directfb_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
1357 dnl echo "-- $directfb_lib_spec -> $directfb_lib"
1358
1359 if test x$have_loadso != xyes && \
1360 test x$enable_directfb_shared = xyes; then
1361 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic directfb loading])
1362 fi
1363 if test x$have_loadso = xyes && \
1364 test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
1365 directfb_shared=yes
1366 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib")
1367 else
1368 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
1369 fi
1370 AC_MSG_RESULT($directfb_shared)
1347 have_video=yes 1371 have_video=yes
1348 fi 1372 fi
1349 fi 1373 fi
1350 } 1374 }
1351 1375