pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SuSE 11.1 installs directfb-config without directfb-devel, so check to

Browse source 
make sure the development headers are actually available!

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403982
This commit is contained in:
Sam Lantinga 2009-10-07 06:11:19 +00:00
parent 6ae47f142b
commit 70baaa8962
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
configure.in
View file

@ -1286,7 +1286,6 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=y
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 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=y
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 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=y
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)