From e2b003a99327c0971850fe9441ab4417e5b0b737 Mon Sep 17 00:00:00 2001
From: orbea <ovariegata@yahoo.com>
Date: Mon, 1 Jan 2018 11:28:19 -0800
Subject: [PATCH] qb: Only look in /opt/vc/include if $HAVE_VIDEOCORE=yes.

---
 qb/config.libs.sh | 8 +++++---
 qb/qb.libs.sh     | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 32ffedc48b..52f32a37dd 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -21,6 +21,7 @@ CLIB=-lc
 PTHREADLIB=-lpthread
 SOCKETLIB=-lc
 SOCKETHEADER=
+INCLUDES='usr/include usr/local/include'
 
 if [ "$OS" = 'BSD' ]; then
    [ -d /usr/local/include ] && add_dirs INCLUDE /usr/local/include
@@ -48,7 +49,7 @@ if [ "$HAVE_VIDEOCORE" != "no" ]; then
    check_pkgconf VC_TEST bcm_host
 
    # use fallback if pkgconfig is not available
-   if [ ! "$VC_TEST_LIBS" ]; then
+   if [ -z "$VC_TEST_LIBS" ]; then
       [ -d /opt/vc/lib ] && add_dirs LIBRARY /opt/vc/lib /opt/vc/lib/GL
       check_lib '' VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm"
    else
@@ -58,10 +59,11 @@ fi
 
 if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
    HAVE_OPENGLES='auto'
-   VC_PREFIX="brcm"
+   VC_PREFIX='brcm'
+   INCLUDES="${INCLUDES} opt/vc/include"
 
    # use fallback if pkgconfig is not available
-   if [ ! "$VC_TEST_LIBS" ]; then
+   if [ -z "$VC_TEST_LIBS" ]; then
       [ -d /opt/vc/include ] && add_dirs INCLUDE /opt/vc/include
       [ -d /opt/vc/include/interface/vcos/pthreads ] && add_dirs INCLUDE /opt/vc/include/interface/vcos/pthreads
       [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_dirs INCLUDE /opt/vc/include/interface/vmcs_host/linux
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index a81030c115..c259f6e128 100644
--- a/qb/qb.libs.sh
+++ b/qb/qb.libs.sh
@@ -168,10 +168,13 @@ check_val() # $1 = language  $2 = HAVE_$2  $3 = lib  $4 = include directory [che
 		check_lib "$1" "$2" "$3"
 
 		if [ "${4:-}" ] && [ "$answer" = 'yes' ]; then
-			for dir in usr/include usr/local/include opt/vc/include; do
-				[ -d "/$dir/$4" ] && { eval "$2_CFLAGS=\"-I/$dir/$4\""; break; }
+			val="$2"
+			include="$4"
+			eval "set -- $INCLUDES"
+			for dir do
+				[ -d "/$dir/$include" ] && { eval "${val}_CFLAGS=\"-I/$dir/$include\""; break; }
 			done
-			[ -z "$(eval "printf %s \"\${$2_CFLAGS}\"")" ] && eval "HAVE_$2=no"
+			[ -z "$(eval "printf %s \"\${${val}_CFLAGS}\"")" ] && eval "HAVE_$val=no"
 		fi
 
 		if [ "$answer" = 'no' ] && [ "$oldval" = 'yes' ]; then