PatchSet 6980
Date: 2005/12/03 12:54:16
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fix to be able to use ECJ instead of JIKES.
* configure.ac: Added a new option "--with-ecj" to be able
to compile with ecj. Reworked the java compiler detection.
* Makefile.am,
libraries/javalib/Makefile.am.in,
libraries/javalib/rebuildLib.in,
libraries/javalib/awt-implementations/kaffe/Makefile.am,
libraries/javalib/gmp-math/Makefile.am,
test/Makefile.am,
test/internal/Makefile.am,
test/jni/Makefile.am,
tools/gjdoc/javalib/Makefile.am,
tools/javatools/javalib/Makefile.am:
Use JAVA_COMPILER instead of JIKES.
* Makefile.in,
configure,
config/Makefile.in,
include/Makefile.in,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/Makefile.in,
kaffe/kaffevm/boehm-gc/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/Makefile.in,
kaffe/kaffevm/jni/Makefile.in,
kaffe/kaffevm/kaffe-gc/Makefile.in,
kaffe/kaffevm/systems/Makefile.in,
kaffe/kaffevm/systems/beos-native/Makefile.in,
kaffe/kaffevm/systems/drops-l4threads/Makefile.in,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
kaffe/kaffevm/verifier/Makefile.in,
kaffe/man/Makefile.in,
kaffe/scripts/Makefile.in,
kaffe/scripts/bat/Makefile.in,
kaffe/scripts/compat/Makefile.in,
kaffe/xprof/Makefile.in,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/nano-X/Makefile.in,
libraries/clib/awt/qt/Makefile.in,
libraries/clib/fdlibm/Makefile.in,
libraries/clib/io/Makefile.in,
libraries/clib/management/Makefile.in,
libraries/clib/math/Makefile.in,
libraries/clib/native/Makefile.in,
libraries/clib/net/Makefile.in
libraries/clib/nio/Makefile.in
libraries/clib/security/Makefile.in
libraries/clib/sound/Makefile.in
libraries/clib/sound/alsa/Makefile.in,
libraries/clib/sound/common/Makefile.in,
libraries/clib/sound/esd/Makefile.in,
libraries/clib/target/Makefile.in,
libraries/clib/target/Linux/Makefile.in,
libraries/clib/target/generic/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/extensions/comm/Makefile.in,
libraries/extensions/comm/javalib/Makefile.in,
libraries/extensions/microsoft/Makefile.in,
libraries/extensions/microsoft/clib/Makefile.in,
libraries/extensions/microsoft/javalib/Makefile.in,
libraries/extensions/pjava/Makefile.in,
libraries/extensions/pjava/javalib/Makefile.in,
libraries/extensions/servlet/Makefile.in,
libraries/extensions/servlet/javalib/Makefile.in,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in,
libraries/javalib/awt-implementations/Makefile.in,
libraries/javalib/awt-implementations/kaffe/Makefile.in,
libraries/javalib/external/classpath/config.sub,
libraries/javalib/gmp-math/Makefile.in,
replace/Makefile.in,
test/Makefile.in,
test/internal/Makefile.in,
test/jni/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/compiler/Makefile.in,
test/regression/run_time/Makefile.in,
tools/Makefile.in,
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in,
tools/javatools/Makefile.in,
tools/javatools/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.4502->1.4503
Makefile.am:1.103->1.104
Makefile.in:1.232->1.233
configure:1.508->1.509
configure.ac:1.187->1.188
config/Makefile.in:1.198->1.199
include/Makefile.in:1.249->1.250
kaffe/Makefile.in:1.158->1.159
kaffe/jvmpi/Makefile.in:1.82->1.83
kaffe/kaffe/Makefile.in:1.180->1.181
kaffe/kaffeh/Makefile.in:1.160->1.161
kaffe/kaffevm/Makefile.in:1.212->1.213
kaffe/kaffevm/boehm-gc/Makefile.in:1.45->1.46
kaffe/kaffevm/gcj/Makefile.in:1.138->1.139
kaffe/kaffevm/intrp/Makefile.in:1.147->1.148
kaffe/kaffevm/jit/Makefile.in:1.157->1.158
kaffe/kaffevm/jit3/Makefile.in:1.127->1.128
kaffe/kaffevm/jni/Makefile.in:1.51->1.52
kaffe/kaffevm/kaffe-gc/Makefile.in:1.44->1.45
kaffe/kaffevm/systems/Makefile.in:1.146->1.147
kaffe/kaffevm/systems/beos-native/Makefile.in:1.138->1.139
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.1->1.2
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.144->1.145
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.148->1.149
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.123->1.124
kaffe/kaffevm/verifier/Makefile.in:1.50->1.51
kaffe/man/Makefile.in:1.145->1.146
kaffe/scripts/Makefile.in:1.185->1.186
kaffe/scripts/bat/Makefile.in:1.137->1.138
kaffe/scripts/compat/Makefile.in:1.164->1.165
kaffe/xprof/Makefile.in:1.113->1.114
libraries/Makefile.in:1.141->1.142
libraries/clib/Makefile.in:1.157->1.158
libraries/clib/awt/Makefile.in:1.156->1.157
libraries/clib/awt/X/Makefile.in:1.149->1.150
libraries/clib/awt/nano-X/Makefile.in:1.21->1.22
libraries/clib/awt/qt/Makefile.in:1.104->1.105
libraries/clib/fdlibm/Makefile.in:1.19->1.20
libraries/clib/io/Makefile.in:1.154->1.155
libraries/clib/management/Makefile.in:1.158->1.159
libraries/clib/math/Makefile.in:1.153->1.154
libraries/clib/native/Makefile.in:1.199->1.200
libraries/clib/net/Makefile.in:1.163->1.164
libraries/clib/nio/Makefile.in:1.87->1.88
libraries/clib/security/Makefile.in:1.124->1.125
libraries/clib/sound/Makefile.in:1.50->1.51
libraries/clib/sound/alsa/Makefile.in:1.51->1.52
libraries/clib/sound/common/Makefile.in:1.50->1.51
libraries/clib/sound/esd/Makefile.in:1.51->1.52
libraries/clib/target/Makefile.in:1.10->1.11
libraries/clib/target/Linux/Makefile.in:1.10->1.11
libraries/clib/target/generic/Makefile.in:1.10->1.11
libraries/clib/zip/Makefile.in:1.155->1.156
libraries/extensions/Makefile.in:1.133->1.134
libraries/extensions/comm/Makefile.in:1.127->1.128
libraries/extensions/comm/javalib/Makefile.in:1.128->1.129
libraries/extensions/microsoft/Makefile.in:1.119->1.120
libraries/extensions/microsoft/clib/Makefile.in:1.123->1.124
libraries/extensions/microsoft/javalib/Makefile.in:1.121->1.122
libraries/extensions/pjava/Makefile.in:1.127->1.128
libraries/extensions/pjava/javalib/Makefile.in:1.128->1.129
libraries/extensions/servlet/Makefile.in:1.127->1.128
libraries/extensions/servlet/javalib/Makefile.in:1.128->1.129
libraries/javalib/Makefile.am:1.403->1.404
libraries/javalib/Makefile.am.in:1.53->1.54
libraries/javalib/Makefile.in:1.499->1.500
libraries/javalib/rebuildLib.in:INITIAL->1.47
libraries/javalib/awt-implementations/Makefile.in:1.35->1.36
libraries/javalib/awt-implementations/kaffe/Makefile.am:1.7->1.8
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.39->1.40
libraries/javalib/external/classpath/config.sub:1.3->1.4
libraries/javalib/gmp-math/Makefile.am:1.6->1.7
libraries/javalib/gmp-math/Makefile.in:1.42->1.43
replace/Makefile.in:1.100->1.101
test/Makefile.am:INITIAL->1.9
test/Makefile.in:1.150->1.151
test/internal/Makefile.am:1.21->1.22
test/internal/Makefile.in:1.118->1.119
test/jni/Makefile.am:1.13->1.14
test/jni/Makefile.in:1.53->1.54
test/regression/Makefile.in:1.225->1.226
test/regression/compile_time/Makefile.in:1.78->1.79
test/regression/compiler/Makefile.in:1.62->1.63
test/regression/run_time/Makefile.in:1.77->1.78
tools/Makefile.in:1.52->1.53
tools/gjdoc/Makefile.in:1.51->1.52
tools/gjdoc/javalib/Makefile.am:1.18->1.19
tools/gjdoc/javalib/Makefile.in:1.65->1.66
tools/javatools/Makefile.in:1.5->1.6
tools/javatools/javalib/Makefile.am:1.1->1.2
tools/javatools/javalib/Makefile.in:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4502 kaffe/ChangeLog:1.4503
--- kaffe/ChangeLog:1.4502 Thu Dec 1 23:50:53 2005
+++ kaffe/ChangeLog Sat Dec 3 12:54:16 2005
@@ -1,3 +1,101 @@
+2005-12-03 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * configure.ac: Added a new option "--with-ecj" to be able
+ to compile with ecj. Reworked the java compiler detection.
+
+ * Makefile.am,
+ libraries/javalib/Makefile.am.in,
+ libraries/javalib/rebuildLib.in,
+ libraries/javalib/awt-implementations/kaffe/Makefile.am,
+ libraries/javalib/gmp-math/Makefile.am,
+ test/Makefile.am,
+ test/internal/Makefile.am,
+ test/jni/Makefile.am,
+ tools/gjdoc/javalib/Makefile.am,
+ tools/javatools/javalib/Makefile.am:
+ Use JAVA_COMPILER instead of JIKES.
+
+ * Makefile.in,
+ configure,
+ config/Makefile.in,
+ include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/boehm-gc/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/jni/Makefile.in,
+ kaffe/kaffevm/kaffe-gc/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/drops-l4threads/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/kaffevm/verifier/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/nano-X/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/fdlibm/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in
+ libraries/clib/nio/Makefile.in
+ libraries/clib/security/Makefile.in
+ libraries/clib/sound/Makefile.in
+ libraries/clib/sound/alsa/Makefile.in,
+ libraries/clib/sound/common/Makefile.in,
+ libraries/clib/sound/esd/Makefile.in,
+ libraries/clib/target/Makefile.in,
+ libraries/clib/target/Linux/Makefile.in,
+ libraries/clib/target/generic/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/awt-implementations/Makefile.in,
+ libraries/javalib/awt-implementations/kaffe/Makefile.in,
+ libraries/javalib/external/classpath/config.sub,
+ libraries/javalib/gmp-math/Makefile.in,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/jni/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/compiler/Makefile.in,
+ test/regression/run_time/Makefile.in,
+ tools/Makefile.in,
+ tools/gjdoc/Makefile.in,
+ tools/gjdoc/javalib/Makefile.in,
+ tools/javatools/Makefile.in,
+ tools/javatools/javalib/Makefile.in:
+ Regenerated.
+
2005-12-02 Alexander Boettcher <[EMAIL PROTECTED]>
* configure: add thread binding drops-l4threads
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.103 kaffe/Makefile.am:1.104
--- kaffe/Makefile.am:1.103 Sat Oct 29 19:42:56 2005
+++ kaffe/Makefile.am Sat Dec 3 12:54:18 2005
@@ -162,7 +162,7 @@
"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
BUILD_ENVIRONMENT-make: Makefile
- echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
+ echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\;
export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.232 kaffe/Makefile.in:1.233
--- kaffe/Makefile.in:1.232 Sat Oct 29 19:42:56 2005
+++ kaffe/Makefile.in Sat Dec 3 12:54:18 2005
@@ -196,8 +196,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -211,8 +211,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
@@ -960,7 +960,7 @@
"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
BUILD_ENVIRONMENT-make: Makefile
- echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
+ echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip\''$(PATHSEP)'\'$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\;
export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
Index: kaffe/configure
diff -u kaffe/configure:1.508 kaffe/configure:1.509
--- kaffe/configure:1.508 Thu Dec 1 23:50:55 2005
+++ kaffe/configure Sat Dec 3 12:54:19 2005
@@ -492,7 +492,7 @@
ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS
CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor
host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL
AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE
MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H
KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H
HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR
HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE
ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS
NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE
SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS
PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE
USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JIKES
KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS
ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE
HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE
KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME
subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE
LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE
COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE
COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK
QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE
NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS
COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE
COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE
COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS
PROFILE COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS
KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE
COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS ENABLE_BINRELOC_TRUE
ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir
nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF
CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS
CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor
host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL
AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE
MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H
KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H
HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR
HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE
ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS
NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE
SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS
PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE
USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER
KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS
ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE
HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE
KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME
subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE
LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE
COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE
COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK
QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE
NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS
COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE
COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE
COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS
PROFILE COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS
KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE
COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS ENABLE_BINRELOC_TRUE
ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir
nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF
CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1144,6 +1144,8 @@
boehm-gc)
--with-glibj-zip=ABS.PATH
use precompiled kaffe class library
+ --with-ecj=ECJ Define to use ECJ as the java compiler instead of
+ jikes
--with-jikes<=JIKES> Define to use jikes compiler [default=yes]. If
yes, use jikes +Pno-switchcheck +Pno-shadow +E
--with-libffi Use libffi for sysdepCallMethod
@@ -5962,7 +5964,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5965 "configure"' > conftest.$ac_ext
+ echo '#line 5967 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7319,7 +7321,7 @@
# Provide some information about the compiler.
-echo "$as_me:7322:" \
+echo "$as_me:7324:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8421,11 +8423,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8424: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8426: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8428: \$? = $ac_status" >&5
+ echo "$as_me:8430: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8683,11 +8685,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8686: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8688: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8690: \$? = $ac_status" >&5
+ echo "$as_me:8692: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8745,11 +8747,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8748: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8750: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8752: \$? = $ac_status" >&5
+ echo "$as_me:8754: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10985,7 +10987,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10988 "configure"
+#line 10990 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11083,7 +11085,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11086 "configure"
+#line 11088 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13335,11 +13337,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13340: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13342: \$? = $ac_status" >&5
+ echo "$as_me:13344: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13397,11 +13399,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13400: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13402: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13404: \$? = $ac_status" >&5
+ echo "$as_me:13406: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14766,7 +14768,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14769 "configure"
+#line 14771 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14864,7 +14866,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14867 "configure"
+#line 14869 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15749,11 +15751,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15752: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15754: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15756: \$? = $ac_status" >&5
+ echo "$as_me:15758: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15811,11 +15813,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15814: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15816: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15818: \$? = $ac_status" >&5
+ echo "$as_me:15820: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17937,11 +17939,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17940: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17942: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17944: \$? = $ac_status" >&5
+ echo "$as_me:17946: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18199,11 +18201,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18202: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18204: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18206: \$? = $ac_status" >&5
+ echo "$as_me:18208: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18261,11 +18263,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18264: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18266: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18268: \$? = $ac_status" >&5
+ echo "$as_me:18270: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20501,7 +20503,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20504 "configure"
+#line 20506 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20599,7 +20601,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20602 "configure"
+#line 20604 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -25140,6 +25142,23 @@
+
+
+# Check whether --with-ecj or --without-ecj was given.
+if test "${with_ecj+set}" = set; then
+ withval="$with_ecj"
+ JAVA_COMPILER="$withval"
+ use_ecj=yes
+else
+ use_ecj=no
+fi;
+
+echo "$as_me:$LINENO: checking whether to use ecj" >&5
+echo $ECHO_N "checking whether to use ecj... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $use_ecj" >&5
+echo "${ECHO_T}$use_ecj" >&6
+
+
# Extract the first word of "jikes", so it can be a program name with args.
set dummy jikes; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -25179,15 +25198,20 @@
# Check whether --with-jikes or --without-jikes was given.
if test "${with_jikes+set}" = set; then
withval="$with_jikes"
- JIKES="$withval"
+ JIKESPROG="$withval"
+ use_jikes="yes"
else
- with_jikes="yes"
+ use_jikes="no"
fi;
+if test x"$use_ecj" = xno -a x"$use_jikes" = xno; then
+ use_jikes="yes";
+fi
+
echo "$as_me:$LINENO: checking whether to use jikes" >&5
echo $ECHO_N "checking whether to use jikes... $ECHO_C" >&6
-case $with_jikes in
+case $use_jikes in
yes)
if test x"$JIKESPROG" = x"" ; then
if test x$use_glibj_zip = xtrue ; then
@@ -25199,23 +25223,11 @@
{ (exit 1); exit 1; }; }
fi
fi
- JIKES="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
- use_jikes="yes ($JIKES)"
+ JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
+ use_jikes="yes ($JAVA_COMPILER)"
;;
no)
use_jikes="no"
- if test x$use_glibj_zip = xtrue ; then
- { echo "$as_me:$LINENO: WARNING: You have to use jikes 1.21 or
higher to build kaffe's regression tests, or to pass a different external java
compiler to configure script." >&5
-echo "$as_me: WARNING: You have to use jikes 1.21 or higher to build kaffe's
regression tests, or to pass a different external java compiler to configure
script." >&2;}
- else
- { { echo "$as_me:$LINENO: error: You have to use jikes 1.21 or
higher to build kaffe's class library, or to pass a different external java
compiler to configure script." >&5
-echo "$as_me: error: You have to use jikes 1.21 or higher to build kaffe's
class library, or to pass a different external java compiler to configure
script." >&2;}
- { (exit 1); exit 1; }; }
- fi
- ;;
-*)
- JIKES="$with_jikes"
- use_jikes="yes ($JIKES)"
;;
esac
@@ -25223,6 +25235,29 @@
echo "${ECHO_T}$use_jikes" >&6
+if test x"use_ecj" = x"yes" -a x"use_jikes" = x"yes"; then
+ { { echo "$as_me:$LINENO: error: You must specify only one compiler" >&5
+echo "$as_me: error: You must specify only one compiler" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+if test x"$JAVA_COMPILER" = x; then
+ if test x$use_glibj_zip = xtrue ; then
+ { echo "$as_me:$LINENO: WARNING: You need a java compiler to
build kaffe's regression tests, or to pass a different external java compiler
to configure script." >&5
+echo "$as_me: WARNING: You need a java compiler to build kaffe's regression
tests, or to pass a different external java compiler to configure script." >&2;}
+ else
+ { { echo "$as_me:$LINENO: error: You need a java compiler to
build kaffe's class library, or to pass a different external java compiler to
configure script." >&5
+echo "$as_me: error: You need a java compiler to build kaffe's class library,
or to pass a different external java compiler to configure script." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+echo "$as_me:$LINENO: checking which java compiler" >&5
+echo $ECHO_N "checking which java compiler... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $JAVA_COMPILER" >&5
+echo "${ECHO_T}$JAVA_COMPILER" >&6
+
+
+
KAFFEVM_TRAMPOLINES_S=
if test x"$with_engine" != x"intrp" ; then
echo "$as_me:$LINENO: checking for trampolines" >&5
@@ -25502,12 +25537,12 @@
-if test x"$JIKES" != x""; then
- HAVE_JIKES_TRUE=
- HAVE_JIKES_FALSE='#'
+if test x"$JAVA_COMPILER" != x""; then
+ HAVE_JAVAC_TRUE=
+ HAVE_JAVAC_FALSE='#'
else
- HAVE_JIKES_TRUE='#'
- HAVE_JIKES_FALSE=
+ HAVE_JAVAC_TRUE='#'
+ HAVE_JAVAC_FALSE=
fi
@@ -49610,10 +49645,10 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${HAVE_JIKES_TRUE}" && test -z "${HAVE_JIKES_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_JIKES\" was never
defined.
+if test -z "${HAVE_JAVAC_TRUE}" && test -z "${HAVE_JAVAC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JAVAC\" was never
defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_JIKES\" was never defined.
+echo "$as_me: error: conditional \"HAVE_JAVAC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -50518,7 +50553,7 @@
s,@USE_PRECOMPILED_RT_JAR_FALSE@,$USE_PRECOMPILED_RT_JAR_FALSE,;t t
s,@PATH_TO_RT_JAR@,$PATH_TO_RT_JAR,;t t
s,@JIKESPROG@,$JIKESPROG,;t t
-s,@JIKES@,$JIKES,;t t
+s,@JAVA_COMPILER@,$JAVA_COMPILER,;t t
s,@KAFFEVM_TRAMPOLINES_S@,$KAFFEVM_TRAMPOLINES_S,;t t
s,@JAVA_LIBS@,$JAVA_LIBS,;t t
s,@with_engine@,$with_engine,;t t
@@ -50530,8 +50565,8 @@
s,@JASMIN@,$JASMIN,;t t
s,@HAVE_ZIP_TRUE@,$HAVE_ZIP_TRUE,;t t
s,@HAVE_ZIP_FALSE@,$HAVE_ZIP_FALSE,;t t
-s,@HAVE_JIKES_TRUE@,$HAVE_JIKES_TRUE,;t t
-s,@HAVE_JIKES_FALSE@,$HAVE_JIKES_FALSE,;t t
+s,@HAVE_JAVAC_TRUE@,$HAVE_JAVAC_TRUE,;t t
+s,@HAVE_JAVAC_FALSE@,$HAVE_JAVAC_FALSE,;t t
s,@HAVE_MKTEMP_TRUE@,$HAVE_MKTEMP_TRUE,;t t
s,@HAVE_MKTEMP_FALSE@,$HAVE_MKTEMP_FALSE,;t t
s,@HAVE_JASMIN_TRUE@,$HAVE_JASMIN_TRUE,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.187 kaffe/configure.ac:1.188
--- kaffe/configure.ac:1.187 Fri Nov 25 13:41:27 2005
+++ kaffe/configure.ac Sat Dec 3 12:54:27 2005
@@ -748,6 +748,21 @@
AC_SUBST(PATH_TO_RT_JAR)
dnl =========================================================================
+dnl Use ecj
+dnl =========================================================================
+
+
+AC_ARG_WITH([ecj],
+ AS_HELP_STRING([--with-ecj=ECJ],
+ [Define to use ECJ as the java compiler instead of
jikes]),
+ [JAVA_COMPILER="$withval"
+ use_ecj=yes],
+ [use_ecj=no])
+
+AC_MSG_CHECKING([whether to use ecj])
+AC_MSG_RESULT($use_ecj)
+
+dnl =========================================================================
dnl Use jikes
dnl =========================================================================
@@ -755,12 +770,17 @@
AC_ARG_WITH([jikes],
AS_HELP_STRING([--with-jikes<=JIKES>],
[Define to use jikes compiler @<:@default=yes@:>@.
If yes, use jikes +Pno-switchcheck +Pno-shadow +E]),
- [JIKES="$withval"],
- [with_jikes="yes"])
+ [JIKESPROG="$withval"
+ use_jikes="yes"],
+ [use_jikes="no"])
+
+if test x"$use_ecj" = xno -a x"$use_jikes" = xno; then
+ use_jikes="yes";
+fi
AC_MSG_CHECKING([whether to use jikes])
-case $with_jikes in
+case $use_jikes in
yes)
if test x"$JIKESPROG" = x"" ; then
if test x$use_glibj_zip = xtrue ; then
@@ -769,25 +789,35 @@
AC_MSG_ERROR([No jikes compiler found. It is required to build
Kaffe's class library. Recommended is jikes version 1.21 or higher.])
fi
fi
- JIKES="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
- use_jikes="yes ($JIKES)"
+ JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
+ use_jikes="yes ($JAVA_COMPILER)"
;;
no)
use_jikes="no"
- if test x$use_glibj_zip = xtrue ; then
- AC_MSG_WARN([You have to use jikes 1.21 or higher to build kaffe's
regression tests, or to pass a different external java compiler to configure
script.])
- else
- AC_MSG_ERROR([You have to use jikes 1.21 or higher to build kaffe's
class library, or to pass a different external java compiler to configure
script.])
- fi
- ;;
-*)
- JIKES="$with_jikes"
- use_jikes="yes ($JIKES)"
;;
esac
AC_MSG_RESULT($use_jikes)
-AC_SUBST(JIKES)
+
+dnl =========================================================================
+dnl Set the java compiler variable.
+dnl =========================================================================
+
+if test x"use_ecj" = x"yes" -a x"use_jikes" = x"yes"; then
+ AC_MSG_ERROR([You must specify only one compiler])
+fi
+
+if test x"$JAVA_COMPILER" = x; then
+ if test x$use_glibj_zip = xtrue ; then
+ AC_MSG_WARN([You need a java compiler to build kaffe's
regression tests, or to pass a different external java compiler to configure
script.])
+ else
+ AC_MSG_ERROR([You need a java compiler to build kaffe's class
library, or to pass a different external java compiler to configure script.])
+ fi
+fi
+AC_MSG_CHECKING([which java compiler])
+AC_MSG_RESULT($JAVA_COMPILER)
+
+AC_SUBST(JAVA_COMPILER)
dnl =========================================================================
dnl Look for trampoline code if in JIT mode
@@ -850,7 +880,7 @@
AC_CHECK_PROG(JASMIN, jasmin, jasmin)
AM_CONDITIONAL(HAVE_ZIP, test x"$ZIP" != x"")
-AM_CONDITIONAL(HAVE_JIKES, test x"$JIKES" != x"")
+AM_CONDITIONAL(HAVE_JAVAC, test x"$JAVA_COMPILER" != x"")
AM_CONDITIONAL(HAVE_MKTEMP, test x"$MKTEMP" != x"")
AM_CONDITIONAL(HAVE_JASMIN, test x"$JASMIN" != x"")
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.198 kaffe/config/Makefile.in:1.199
--- kaffe/config/Makefile.in:1.198 Tue Oct 25 15:42:55 2005
+++ kaffe/config/Makefile.in Sat Dec 3 12:54:28 2005
@@ -170,8 +170,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -185,8 +185,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.249 kaffe/include/Makefile.in:1.250
--- kaffe/include/Makefile.in:1.249 Tue Oct 25 15:42:57 2005
+++ kaffe/include/Makefile.in Sat Dec 3 12:54:28 2005
@@ -185,8 +185,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -200,8 +200,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.158 kaffe/kaffe/Makefile.in:1.159
--- kaffe/kaffe/Makefile.in:1.158 Tue Oct 25 15:42:58 2005
+++ kaffe/kaffe/Makefile.in Sat Dec 3 12:54:29 2005
@@ -171,8 +171,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -186,8 +186,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.82 kaffe/kaffe/jvmpi/Makefile.in:1.83
--- kaffe/kaffe/jvmpi/Makefile.in:1.82 Tue Oct 25 15:42:58 2005
+++ kaffe/kaffe/jvmpi/Makefile.in Sat Dec 3 12:54:30 2005
@@ -181,8 +181,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -196,8 +196,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.180 kaffe/kaffe/kaffe/Makefile.in:1.181
--- kaffe/kaffe/kaffe/Makefile.in:1.180 Tue Oct 25 15:42:59 2005
+++ kaffe/kaffe/kaffe/Makefile.in Sat Dec 3 12:54:31 2005
@@ -186,8 +186,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -201,8 +201,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.160
kaffe/kaffe/kaffeh/Makefile.in:1.161
--- kaffe/kaffe/kaffeh/Makefile.in:1.160 Mon Oct 31 20:47:15 2005
+++ kaffe/kaffe/kaffeh/Makefile.in Sat Dec 3 12:54:31 2005
@@ -192,8 +192,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
-HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
+HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
@@ -207,8 +207,8 @@
INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVA_COMPILER = @JAVA_COMPILER@
JAVA_LIBS = @JAVA_LIBS@
-JIKES = @JIKES@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.212
kaffe/kaffe/kaffevm/Makefile.in:1.213
--- kaffe/kaffe/kaffevm/Makefile.in:1.212 Tue Oct 25 15:43:00 2005
+++ kaffe/kaffe/kaffevm/Makefile.in Sat Dec 3 12:54:32 2005
@@ -225,8 +225,8 @@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
