From 4f157056c307ae7d5d0cbd4fa35ffeb2916cd2e0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 15 Feb 2014 15:52:29 +0100
Subject: more Darwin compat fixes, add java as build dependency check for xbmc

---
 scripts/scan-pkgs.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'scripts/scan-pkgs.sh')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 79d416569..1ff957c25 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
+if [[ -n $ADK_PACKAGE_XBMC ]]; then
+	NEED_JAVA="$NEED_JAVA xbmc"
+fi
+
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
@@ -78,7 +82,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 fi
 
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
-	NEED_WWW="$NEED_WWW libXfont"
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
@@ -258,6 +261,13 @@ if [[ -n $NEED_DBUSGLIB ]]; then
 	fi
 fi
 
+if [[ -n $NEED_JAVA ]]; then
+	if ! which java >/dev/null 2>&1; then
+		echo >&2 You need java to build $NEED_JAVA
+		out=1
+	fi
+fi
+
 if [[ -n $ADK_USE_CCACHE ]]; then
         if ! which ccache >/dev/null 2>&1; then
                 echo >&2 You have selected to build with ccache, but ccache could not be found.
-- 
cgit v1.2.3