classpath: fix invalid options

After updated to version 0.99, the following options
became invalid:

* --with-ecj: use JAVAC env variable instead
* --with-fastjar: change to --with-jar
* --with-vm: uae JAVA env variable instead
* --disable-qt4-peer: invalid even in 0.93, just drop it.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 2 insertions, 5 deletions

diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index 1bdfd78..2be849b 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -28,24 +28,21 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 S = "${WORKDIR}/${PBN}-${PV}"
 
 export JAVA = "java"
+export JAVAC = "javac"
 
 EXTRA_OECONF = "\
   --with-glibj \
-  --with-ecj=javac \
-  --with-fastjar=fastjar \
+  --with-jar=${STAGING_BINDIR_NATIVE}/fastjar \
   --includedir=${includedir}/classpath \
-  --with-vm=java \
   --disable-Werror \
   --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \
   --with-gmp=${STAGING_LIBDIR}/.. \
   --disable-alsa \
   --disable-dssi \
-  --disable-qt4-peer \
   --disable-plugin \
   --enable-gconf-peer \
   --enable-gtk-peer \
   --enable-local-sockets \
-  --with-vm=java \
   "