diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-16 10:48:46 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-16 10:48:46 +0100 |
| commit | 3757bab8c484ca0f7ef4e14402f9d1e8f0354d68 (patch) | |
| tree | 9381b698d1501d5f0a2a6725cb6111b87f3caf81 /scripts/scan-pkgs.sh | |
| parent | 5867aad78c4ebd154eace69b026b63d780be0e84 (diff) | |
| parent | 1764075639d3f0caeb0debe3653fa66176c882b8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts/scan-pkgs.sh')
| -rw-r--r-- | scripts/scan-pkgs.sh | 12 |
1 files changed, 11 insertions, 1 deletions
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. |