From 2f058899353e3aaf8f2a5506d0157d1832d6a504 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 23 Mar 2006 15:25:30 +0000 Subject: [PATCH] Hopefully fixed up DirectFB detection --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401608 --- configure.in | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.in b/configure.in index b4ecf6cf6..0fc819b63 100644 --- a/configure.in +++ b/configure.in @@ -1063,15 +1063,9 @@ AC_HELP_STRING([--enable-video-directfb], [use DirectFB video driver [default=ye if test x$DIRECTFBCONFIG = x -o x$DIRECTFBCONFIG = x'"$DIRECTFBCONFIG"'; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test x$PKG_CONFIG != xno ; then - AC_MSG_WARN([*** directfb-config or pkg-config are required to detect the DirectFB video driver.]) - else AC_MSG_CHECKING(for DirectFB $DIRECTFB_REQUIRED_VERSION support) - if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - AC_MSG_ERROR([*** pkg-config too old; version 0.7 or better required.]) - fi - - if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then + if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then then DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb` DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb` video_directfb=yes