Merge DirectFB header check into DirectFB check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19316 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 7 insertions, 16 deletions

diff --git a/configure b/configure
index 5a59d0765d..9a20f4ba4a 100755
--- a/configure
+++ b/configure
@@ -3651,29 +3651,20 @@ else
 fi
 echores "$_tga"
 
-echocheck "DirectFB headers presence"
-  for I in /usr/include/directfb /usr/local/include/directfb /usr/include \
-           /usr/local/include `echo $_inc_extra | sed s/-I//g`; do
-    if test -f "$I/directfb.h" ; then
-      _inc_directfb="-I$I"
-      _res_comment="using $_inc_directfb"
-      echores "yes"
-      break
-    fi
-  done
-  if test -z "$_inc_directfb" ; then
-    _directfb=no
-    echores "not found"
-  fi
 
 echocheck "DirectFB"
 if test "$_directfb" = auto ; then
   _directfb=no
-  cat > $TMPC <<EOF
+  if linux && test -c /dev/fb0; then
+    cat > $TMPC <<EOF
 #include <directfb.h>
 int main(void) { IDirectFB *foo; DirectFBInit(0,0); return 0; }
 EOF
-  linux && test -c /dev/fb0 && cc_check $_inc_directfb -ldirectfb && _directfb=yes
+  for _inc_directfb in $_inc_extra -I/usr/local/include/directfb \
+      -I/usr/include/directfb -I/usr/local/include -I/usr/include; do
+    cc_check $_inc_directfb -ldirectfb && _directfb=yes && break
+  done
+  fi
 fi
 
 if test "$_directfb" = yes; then