Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
SuSE 11.1 installs directfb-config without directfb-devel, so check to
make sure the development headers are actually available!
  • Loading branch information
slouken committed Oct 7, 2009
1 parent 2a66f39 commit c9d3810
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions configure.in
Expand Up @@ -1323,7 +1323,6 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=n
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`
Expand All @@ -1332,9 +1331,7 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=n
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'`
Expand All @@ -1345,8 +1342,17 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [[default=n
DIRECTFB_PREFIX=`$DIRECTFBCONFIG --prefix`
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_ARG_ENABLE(directfb-shared,
Expand Down

0 comments on commit c9d3810

Please sign in to comment.