Mercurial > sdl-ios-xcode
changeset 4279:42ad751f3192 SDL-1.2
SuSE 11.1 installs directfb-config without directfb-devel, so check to
make sure the development headers are actually available!
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 07 Oct 2009 06:11:19 +0000 |
| parents | 010efca83dfc |
| children | e1826b24ee8d |
| files | configure.in |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Wed Oct 07 06:10:40 2009 +0000 +++ b/configure.in Wed Oct 07 06:11:19 2009 +0000 @@ -1286,7 +1286,6 @@ AC_PATH_PROG(DIRECTFBCONFIG, directfb-config, no) if test x$DIRECTFBCONFIG = xno; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - AC_MSG_CHECKING(for DirectFB $DIRECTFB_REQUIRED_VERSION support) if test x$PKG_CONFIG != xno; then if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb; then DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb` @@ -1294,9 +1293,7 @@ video_directfb=yes fi fi - AC_MSG_RESULT($video_directfb) else - AC_MSG_CHECKING(for DirectFB $DIRECTFB_REQUIRED_VERSION support) set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'` NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` set -- `directfb-config --version | sed 's/\./ /g'` @@ -1306,8 +1303,17 @@ DIRECTFB_LIBS=`$DIRECTFBCONFIG --libs` video_directfb=yes fi - AC_MSG_RESULT($video_directfb) fi + if test x$video_directfb = xyes; then + # SuSE 11.1 installs directfb-config without directfb-devel + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $DIRECTFB_CFLAGS" + AC_CHECK_HEADER(directfb.h, have_directfb_hdr=yes, have_directfb_hdr=no) + CFLAGS="$save_CFLAGS" + video_directfb=$have_directfb_hdr + fi + AC_MSG_CHECKING(for DirectFB $DIRECTFB_REQUIRED_VERSION support) + AC_MSG_RESULT($video_directfb) if test x$video_directfb = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)