From f0b814dddb1b74c91fd54af412ad356fc68be4a2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Aug 2011 17:04:28 +0200
Subject: really compile openadk without host java and ant

---
 scripts/scan-pkgs.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 7d94f5976..0eeeeaf7c 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -80,7 +80,14 @@ if [[ -n $ADK_COMPILE_KRB5 ]]; then
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK ]]; then
-	NEED_ANT="$NEED_ANT openjdk"
+	NEED_ZIP="$NEED_ZIP openjdk"
+	NEED_GXX="$NEED_GXX openjdk"
+	NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
+fi
+
+if [[ -n $ADK_COMPILE_OPENJDK ]]; then
+	cd ${TOPDIR}/jtools; bash prereq.sh
+	[ $? -ne 0 ] && out=1
 fi
 
 if [[ -n $ADK_PACKAGE_LIBXCB ]]; then
@@ -348,13 +355,6 @@ if [[ -n $NEED_FLEX ]]; then
 	fi
 fi
 
-if [[ -n $NEED_ANT ]]; then
-	if ! which ant >/dev/null 2>&1; then
-		echo >&2 You need ant to build $NEED_OPENJDK
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_YASM ]]; then
 	if ! which yasm >/dev/null 2>&1; then
 		echo >&2 You need yasm to build $NEED_YASM
-- 
cgit v1.2.3