[configure]: omx_rpi (last, I hope)

diff --git a/configure b/configure
index 974974de59803d1b2ba3d748ce331df64bc60637..50b18f3080a9aa786b70acf4b29029c6bbe3afa4 100755 (executable)
--- a/configure
+++ b/configure
@@ -550,16 +550,17 @@ if enabled ffmpeg_static; then
 
   # omx
   if enabled omx; then
-    has_omx=true
+    OLDCFLAGS=$CFLAGS
+    if [ -d "/opt/vc/include" ]; then
+      CFLAGS="-I/opt/vc/include $CFLAGS"
+    fi
     check_cc_header "bcm_host" omx_rpi
     if enabled omx_rpi; then
-      check_cc_header "IL/OMX_Core" omx || has_omx=false
+      CFLAGS="-I/opt/vc/include/IL $OLDCFLAGS"
     else
-      check_cc_header OMX_Core omx || has_omx=false
-    fi
-    if ! $has_omx; then
-      die "OpenMAX IL not found"
+      CFLAGS=$OLDCFLAGS
     fi
+    check_cc_header OMX_Core omx || die "OpenMAX IL not found"
   fi
 
 else