changeset 1601:a79200e79a61

Hopefully fixed up DirectFB detection
author Sam Lantinga <slouken@libsdl.org>
date Thu, 23 Mar 2006 15:25:30 +0000
parents 77bc91c8c16b
children cd97a8e39874
files configure.in
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Thu Mar 23 15:22:40 2006 +0000
+++ b/configure.in	Thu Mar 23 15:25:30 2006 +0000
@@ -1063,15 +1063,9 @@
         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