[kaffe] CVS kaffe (robilad): fixed cross-compilaiton problems with fastjar
Kaffe CVS
cvs-commits at kaffe.org
Tue Feb 7 15:22:36 PST 2006
PatchSet 7118
Date: 2006/02/07 21:46:51
Author: robilad
Branch: HEAD
Tag: (none)
Log:
fixed cross-compilaiton problems with fastjar
006-02-07 Dalibor Topic <robilad at kaffe.org>
Fix for #7.
* configure.ac: check for fastjar and jar. substitute FASTJAR.
Only use our own built fastjar, if we are not cross-compiling
and no jar tool can be found.
* tools/javatools/javalib/Makefile.am,
tools/gjdoc/javalib/Makefile.am,
libraries/javalib/gmp-math/Makefile.am,
libraries/javalib/awt-implementations/kaffe/Makefile.am:
Use FASTJAR.
Members:
ChangeLog:1.4636->1.4637
Makefile.in:1.246->1.247
configure:1.534->1.535
configure.ac:1.212->1.213
config/Makefile.in:1.211->1.212
external/Makefile.in:1.8->1.9
external/gcc/Makefile.in:1.9->1.10
external/gcc/zlib/Makefile.in:1.8->1.9
include/Makefile.in:1.273->1.274
kaffe/Makefile.in:1.171->1.172
kaffe/jvmpi/Makefile.in:1.95->1.96
kaffe/kaffe/Makefile.in:1.193->1.194
kaffe/kaffeh/Makefile.in:1.173->1.174
kaffe/kaffevm/Makefile.in:1.226->1.227
kaffe/kaffevm/boehm-gc/Makefile.in:1.58->1.59
kaffe/kaffevm/gcj/Makefile.in:1.151->1.152
kaffe/kaffevm/intrp/Makefile.in:1.160->1.161
kaffe/kaffevm/jit/Makefile.in:1.170->1.171
kaffe/kaffevm/jit3/Makefile.in:1.140->1.141
kaffe/kaffevm/jni/Makefile.in:1.64->1.65
kaffe/kaffevm/kaffe-gc/Makefile.in:1.57->1.58
kaffe/kaffevm/systems/Makefile.in:1.160->1.161
kaffe/kaffevm/systems/beos-native/Makefile.in:1.151->1.152
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.14->1.15
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.157->1.158
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.161->1.162
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.136->1.137
kaffe/kaffevm/verifier/Makefile.in:1.63->1.64
kaffe/man/Makefile.in:1.158->1.159
kaffe/scripts/Makefile.in:1.198->1.199
kaffe/scripts/bat/Makefile.in:1.150->1.151
kaffe/scripts/compat/Makefile.in:1.177->1.178
kaffe/xprof/Makefile.in:1.126->1.127
libraries/Makefile.in:1.154->1.155
libraries/clib/Makefile.in:1.171->1.172
libraries/clib/awt/Makefile.in:1.169->1.170
libraries/clib/awt/X/Makefile.in:1.162->1.163
libraries/clib/awt/nano-X/Makefile.in:1.34->1.35
libraries/clib/awt/qt/Makefile.in:1.117->1.118
libraries/clib/io/Makefile.in:1.167->1.168
libraries/clib/management/Makefile.in:1.171->1.172
libraries/clib/math/Makefile.in:1.166->1.167
libraries/clib/native/Makefile.in:1.214->1.215
libraries/clib/net/Makefile.in:1.176->1.177
libraries/clib/nio/Makefile.in:1.101->1.102
libraries/clib/security/Makefile.in:1.137->1.138
libraries/clib/sound/Makefile.in:1.63->1.64
libraries/clib/sound/alsa/Makefile.in:1.64->1.65
libraries/clib/sound/common/Makefile.in:1.63->1.64
libraries/clib/sound/esd/Makefile.in:1.64->1.65
libraries/clib/target/Makefile.in:1.23->1.24
libraries/clib/target/Linux/Makefile.in:1.23->1.24
libraries/clib/target/generic/Makefile.in:1.23->1.24
libraries/clib/zip/Makefile.in:1.168->1.169
libraries/extensions/Makefile.in:1.146->1.147
libraries/extensions/comm/Makefile.in:1.140->1.141
libraries/extensions/comm/javalib/Makefile.in:1.141->1.142
libraries/extensions/microsoft/Makefile.in:1.132->1.133
libraries/extensions/microsoft/clib/Makefile.in:1.136->1.137
libraries/extensions/microsoft/javalib/Makefile.in:1.134->1.135
libraries/extensions/pjava/Makefile.in:1.140->1.141
libraries/extensions/pjava/javalib/Makefile.in:1.141->1.142
libraries/extensions/servlet/Makefile.in:1.140->1.141
libraries/extensions/servlet/javalib/Makefile.in:1.141->1.142
libraries/javalib/Makefile.am:1.420->1.421
libraries/javalib/Makefile.in:1.526->1.527
libraries/javalib/awt-implementations/Makefile.in:1.48->1.49
libraries/javalib/awt-implementations/kaffe/Makefile.am:1.9->1.10
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.53->1.54
libraries/javalib/external/classpath/config.guess:1.14->1.15
libraries/javalib/external/classpath/config.sub:1.24->1.25
libraries/javalib/external/classpath/ltmain.sh:1.14->1.15
libraries/javalib/gmp-math/Makefile.am:1.8->1.9
libraries/javalib/gmp-math/Makefile.in:1.55->1.56
replace/Makefile.in:1.113->1.114
scripts/ltmain.sh:1.20->1.21
test/Makefile.in:1.163->1.164
test/internal/Makefile.in:1.132->1.133
test/jni/Makefile.in:1.66->1.67
test/regression/Makefile.in:1.239->1.240
test/regression/compile_time/Makefile.in:1.91->1.92
test/regression/compiler/Makefile.in:1.75->1.76
test/regression/run_time/Makefile.in:1.90->1.91
tools/Makefile.in:1.65->1.66
tools/gjdoc/Makefile.in:1.64->1.65
tools/gjdoc/javalib/Makefile.am:1.22->1.23
tools/gjdoc/javalib/Makefile.in:1.80->1.81
tools/javatools/Makefile.in:1.18->1.19
tools/javatools/javalib/Makefile.am:1.5->1.6
tools/javatools/javalib/Makefile.in:1.19->1.20
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4636 kaffe/ChangeLog:1.4637
--- kaffe/ChangeLog:1.4636 Tue Feb 7 00:18:34 2006
+++ kaffe/ChangeLog Tue Feb 7 21:46:51 2006
@@ -1,4 +1,19 @@
+2006-02-07 Dalibor Topic <robilad at kaffe.org>
+
+ Fix for #7.
+
+ * configure.ac: check for fastjar and jar. substitute FASTJAR.
+ Only use our own built fastjar, if we are not cross-compiling
+ and no jar tool can be found.
+
+ * tools/javatools/javalib/Makefile.am,
+ tools/gjdoc/javalib/Makefile.am,
+ libraries/javalib/gmp-math/Makefile.am,
+ libraries/javalib/awt-implementations/kaffe/Makefile.am:
+ Use FASTJAR.
+
2006-02-07 Riccardo Mottola <riccardo at kaffe.org>
+
* libraries/javalib/awt-implementations/kaffe/java/awt/Component.java,
libraries/javalib/awt-implementations/kaffe/java/awt/Container.java:
Added new stubs.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.246 kaffe/Makefile.in:1.247
--- kaffe/Makefile.in:1.246 Sat Feb 4 16:47:41 2006
+++ kaffe/Makefile.in Tue Feb 7 21:46:53 2006
@@ -199,6 +199,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/configure
diff -u kaffe/configure:1.534 kaffe/configure:1.535
--- kaffe/configure:1.534 Sun Feb 5 00:36:30 2006
+++ kaffe/configure Tue Feb 7 21:46:53 2006
@@ -493,7 +493,7 @@
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
ac_subdirs_all="$ac_subdirs_all external/gcc/fastjar"
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 LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE REPLACE_GETOPT_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 CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE 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 MKTEMP JASMIN 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 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 COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES kaffe_builddir 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 LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE REPLACE_GETOPT_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 CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE 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 MKTEMP JASMIN 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 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 COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH kaffe_builddir FASTJAR 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.
@@ -50200,6 +50200,71 @@
+# set absolute builddir path
+
+kaffe_builddir=`pwd`
+
+
+# detect fastjar and set FASTJAR to its path
+# if we are not cross-compiling, and no jar/fastjar tool can be found,
+# use the freshly compiled one.
+
+for ac_prog in fastjar jar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FASTJAR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $FASTJAR in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_FASTJAR="$FASTJAR" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_FASTJAR="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+FASTJAR=$ac_cv_path_FASTJAR
+
+if test -n "$FASTJAR"; then
+ echo "$as_me:$LINENO: result: $FASTJAR" >&5
+echo "${ECHO_T}$FASTJAR" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$FASTJAR" && break
+done
+
+
+if test -z "${FASTJAR}"; then
+ if test x"$cross_compiling" = x"yes"; then
+ { { echo "$as_me:$LINENO: error: please set FASTJAR to the full pathname of a locally executable fastjar" >&5
+echo "$as_me: error: please set FASTJAR to the full pathname of a locally executable fastjar" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ FASTJAR="${kaffe_builddir}/external/gcc/fastjar/fastjar"
+
+ fi
+fi
+
# We do this hear to because we need prefixes set.
test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -50558,13 +50623,11 @@
ac_configure_args="$ac_configure_args --with-ecj=${JAVA_COMPILER}"
fi
-kaffe_builddir=`pwd`
-
ac_configure_args="$ac_configure_args --disable-core-jni"
ac_configure_args="$ac_configure_args --disable-examples"
ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}"
ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}"
-ac_configure_args="$ac_configure_args --with-fastjar=${kaffe_builddir}/external/gcc/fastjar/fastjar"
+ac_configure_args="$ac_configure_args --with-fastjar=${FASTJAR}"
real_srcdir=`cd $srcdir; pwd`
vmdir=${real_srcdir}/libraries/javalib/vmspecific
ac_configure_args="$ac_configure_args --with-vm-classes=${vmdir}"
@@ -52028,6 +52091,8 @@
s, at BINRELOC_LIBS@,$BINRELOC_LIBS,;t t
s, at KAFFEH@,$KAFFEH,;t t
s, at MAKE_KAFFEH@,$MAKE_KAFFEH,;t t
+s, at kaffe_builddir@,$kaffe_builddir,;t t
+s, at FASTJAR@,$FASTJAR,;t t
s, at toolslibdir@,$toolslibdir,;t t
s, at jredir@,$jredir,;t t
s, at jrebindir@,$jrebindir,;t t
@@ -52041,7 +52106,6 @@
s, at kaffebin_TRANSF@,$kaffebin_TRANSF,;t t
s, at CFLAGS_WITHOUT_PG@,$CFLAGS_WITHOUT_PG,;t t
s, at CLASSPATH_INCLUDES@,$CLASSPATH_INCLUDES,;t t
-s, at kaffe_builddir@,$kaffe_builddir,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
/@cpu_os_frag@/r $cpu_os_frag
s, at cpu_os_frag@,,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.212 kaffe/configure.ac:1.213
--- kaffe/configure.ac:1.212 Sun Feb 5 00:36:40 2006
+++ kaffe/configure.ac Tue Feb 7 21:47:02 2006
@@ -2311,6 +2311,26 @@
dnl KAFFEH is AC_SUBSTed by AC_PATH_PROG
AC_SUBST(MAKE_KAFFEH)
+# set absolute builddir path
+
+kaffe_builddir=`pwd`
+AC_SUBST([kaffe_builddir])
+
+# detect fastjar and set FASTJAR to its path
+# if we are not cross-compiling, and no jar/fastjar tool can be found,
+# use the freshly compiled one.
+
+AC_PATH_PROGS([FASTJAR], [fastjar jar])
+
+if test -z "${FASTJAR}"; then
+ if test x"$cross_compiling" = x"yes"; then
+ AC_MSG_ERROR([please set FASTJAR to the full pathname of a locally executable fastjar])
+ else
+ FASTJAR="${kaffe_builddir}/external/gcc/fastjar/fastjar"
+ AC_SUBST([FASTJAR])
+ fi
+fi
+
dnl =========================================================================
dnl Define directory to put native library support
dnl -------------------------------------------------------------------------
@@ -2437,13 +2457,11 @@
ac_configure_args="$ac_configure_args --with-ecj=${JAVA_COMPILER}"
fi
-kaffe_builddir=`pwd`
-AC_SUBST([kaffe_builddir])
ac_configure_args="$ac_configure_args --disable-core-jni"
ac_configure_args="$ac_configure_args --disable-examples"
ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}"
ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}"
-ac_configure_args="$ac_configure_args --with-fastjar=${kaffe_builddir}/external/gcc/fastjar/fastjar"
+ac_configure_args="$ac_configure_args --with-fastjar=${FASTJAR}"
real_srcdir=`cd $srcdir; pwd`
vmdir=${real_srcdir}/libraries/javalib/vmspecific
ac_configure_args="$ac_configure_args --with-vm-classes=${vmdir}"
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.211 kaffe/config/Makefile.in:1.212
--- kaffe/config/Makefile.in:1.211 Sat Feb 4 16:47:54 2006
+++ kaffe/config/Makefile.in Tue Feb 7 21:47:03 2006
@@ -173,6 +173,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/external/Makefile.in
diff -u kaffe/external/Makefile.in:1.8 kaffe/external/Makefile.in:1.9
--- kaffe/external/Makefile.in:1.8 Sat Feb 4 16:47:55 2006
+++ kaffe/external/Makefile.in Tue Feb 7 21:47:04 2006
@@ -166,6 +166,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/external/gcc/Makefile.in
diff -u kaffe/external/gcc/Makefile.in:1.9 kaffe/external/gcc/Makefile.in:1.10
--- kaffe/external/gcc/Makefile.in:1.9 Sat Feb 4 16:47:55 2006
+++ kaffe/external/gcc/Makefile.in Tue Feb 7 21:47:04 2006
@@ -166,6 +166,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/external/gcc/zlib/Makefile.in
diff -u kaffe/external/gcc/zlib/Makefile.in:1.8 kaffe/external/gcc/zlib/Makefile.in:1.9
--- kaffe/external/gcc/zlib/Makefile.in:1.8 Sat Feb 4 16:47:56 2006
+++ kaffe/external/gcc/zlib/Makefile.in Tue Feb 7 21:47:05 2006
@@ -178,6 +178,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.273 kaffe/include/Makefile.in:1.274
--- kaffe/include/Makefile.in:1.273 Sat Feb 4 16:47:56 2006
+++ kaffe/include/Makefile.in Tue Feb 7 21:47:07 2006
@@ -188,6 +188,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.171 kaffe/kaffe/Makefile.in:1.172
--- kaffe/kaffe/Makefile.in:1.171 Sat Feb 4 16:47:57 2006
+++ kaffe/kaffe/Makefile.in Tue Feb 7 21:47:08 2006
@@ -174,6 +174,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.95 kaffe/kaffe/jvmpi/Makefile.in:1.96
--- kaffe/kaffe/jvmpi/Makefile.in:1.95 Sat Feb 4 16:47:58 2006
+++ kaffe/kaffe/jvmpi/Makefile.in Tue Feb 7 21:47:08 2006
@@ -184,6 +184,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.193 kaffe/kaffe/kaffe/Makefile.in:1.194
--- kaffe/kaffe/kaffe/Makefile.in:1.193 Sat Feb 4 16:47:59 2006
+++ kaffe/kaffe/kaffe/Makefile.in Tue Feb 7 21:47:09 2006
@@ -189,6 +189,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.173 kaffe/kaffe/kaffeh/Makefile.in:1.174
--- kaffe/kaffe/kaffeh/Makefile.in:1.173 Sat Feb 4 16:48:00 2006
+++ kaffe/kaffe/kaffeh/Makefile.in Tue Feb 7 21:47:09 2006
@@ -195,6 +195,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.226 kaffe/kaffe/kaffevm/Makefile.in:1.227
--- kaffe/kaffe/kaffevm/Makefile.in:1.226 Sat Feb 4 16:48:00 2006
+++ kaffe/kaffe/kaffevm/Makefile.in Tue Feb 7 21:47:10 2006
@@ -228,6 +228,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.58 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.59
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.58 Sat Feb 4 16:48:01 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Tue Feb 7 21:47:14 2006
@@ -197,6 +197,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.151 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.152
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.151 Sat Feb 4 16:48:01 2006
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Tue Feb 7 21:47:18 2006
@@ -192,6 +192,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.160 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.161
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.160 Sat Feb 4 16:48:02 2006
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Tue Feb 7 21:47:19 2006
@@ -183,6 +183,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.170 kaffe/kaffe/kaffevm/jit/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.170 Sat Feb 4 16:48:04 2006
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Tue Feb 7 21:47:19 2006
@@ -189,6 +189,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.140 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.141
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.140 Sat Feb 4 16:48:04 2006
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Tue Feb 7 21:47:21 2006
@@ -189,6 +189,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.64 kaffe/kaffe/kaffevm/jni/Makefile.in:1.65
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.64 Sat Feb 4 16:48:05 2006
+++ kaffe/kaffe/kaffevm/jni/Makefile.in Tue Feb 7 21:47:23 2006
@@ -187,6 +187,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.57 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.58
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.57 Sat Feb 4 16:48:05 2006
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Tue Feb 7 21:47:23 2006
@@ -183,6 +183,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.160 kaffe/kaffe/kaffevm/systems/Makefile.in:1.161
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.160 Sat Feb 4 16:48:05 2006
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Tue Feb 7 21:47:24 2006
@@ -173,6 +173,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.151 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.152
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.151 Sat Feb 4 16:48:06 2006
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Tue Feb 7 21:47:25 2006
@@ -182,6 +182,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.14 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.15
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.14 Sat Feb 4 16:48:06 2006
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in Tue Feb 7 21:47:25 2006
@@ -177,6 +177,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.157 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.158
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.157 Sat Feb 4 16:48:07 2006
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in Tue Feb 7 21:47:26 2006
@@ -182,6 +182,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.161 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.162
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.161 Sat Feb 4 16:48:07 2006
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in Tue Feb 7 21:47:27 2006
@@ -183,6 +183,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.136 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.137
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.136 Sat Feb 4 16:48:09 2006
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Tue Feb 7 21:47:28 2006
@@ -188,6 +188,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.63 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.64
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.63 Sat Feb 4 16:48:10 2006
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in Tue Feb 7 21:47:29 2006
@@ -184,6 +184,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.158 kaffe/kaffe/man/Makefile.in:1.159
--- kaffe/kaffe/man/Makefile.in:1.158 Sat Feb 4 16:48:10 2006
+++ kaffe/kaffe/man/Makefile.in Tue Feb 7 21:47:30 2006
@@ -170,6 +170,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.198 kaffe/kaffe/scripts/Makefile.in:1.199
--- kaffe/kaffe/scripts/Makefile.in:1.198 Sat Feb 4 16:48:11 2006
+++ kaffe/kaffe/scripts/Makefile.in Tue Feb 7 21:47:30 2006
@@ -185,6 +185,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.150 kaffe/kaffe/scripts/bat/Makefile.in:1.151
--- kaffe/kaffe/scripts/bat/Makefile.in:1.150 Sat Feb 4 16:48:11 2006
+++ kaffe/kaffe/scripts/bat/Makefile.in Tue Feb 7 21:47:32 2006
@@ -165,6 +165,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.177 kaffe/kaffe/scripts/compat/Makefile.in:1.178
--- kaffe/kaffe/scripts/compat/Makefile.in:1.177 Sat Feb 4 16:48:12 2006
+++ kaffe/kaffe/scripts/compat/Makefile.in Tue Feb 7 21:47:33 2006
@@ -171,6 +171,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.126 kaffe/kaffe/xprof/Makefile.in:1.127
--- kaffe/kaffe/xprof/Makefile.in:1.126 Sat Feb 4 16:48:12 2006
+++ kaffe/kaffe/xprof/Makefile.in Tue Feb 7 21:47:34 2006
@@ -200,6 +200,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/Makefile.in
diff -u kaffe/libraries/Makefile.in:1.154 kaffe/libraries/Makefile.in:1.155
--- kaffe/libraries/Makefile.in:1.154 Sat Feb 4 16:48:14 2006
+++ kaffe/libraries/Makefile.in Tue Feb 7 21:47:35 2006
@@ -174,6 +174,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.171 kaffe/libraries/clib/Makefile.in:1.172
--- kaffe/libraries/clib/Makefile.in:1.171 Sat Feb 4 16:48:14 2006
+++ kaffe/libraries/clib/Makefile.in Tue Feb 7 21:47:35 2006
@@ -178,6 +178,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/awt/Makefile.in
diff -u kaffe/libraries/clib/awt/Makefile.in:1.169 kaffe/libraries/clib/awt/Makefile.in:1.170
--- kaffe/libraries/clib/awt/Makefile.in:1.169 Sat Feb 4 16:48:15 2006
+++ kaffe/libraries/clib/awt/Makefile.in Tue Feb 7 21:47:40 2006
@@ -184,6 +184,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.162 kaffe/libraries/clib/awt/X/Makefile.in:1.163
--- kaffe/libraries/clib/awt/X/Makefile.in:1.162 Sat Feb 4 16:48:15 2006
+++ kaffe/libraries/clib/awt/X/Makefile.in Tue Feb 7 21:47:42 2006
@@ -199,6 +199,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/awt/nano-X/Makefile.in
diff -u kaffe/libraries/clib/awt/nano-X/Makefile.in:1.34 kaffe/libraries/clib/awt/nano-X/Makefile.in:1.35
--- kaffe/libraries/clib/awt/nano-X/Makefile.in:1.34 Sat Feb 4 16:48:16 2006
+++ kaffe/libraries/clib/awt/nano-X/Makefile.in Tue Feb 7 21:47:43 2006
@@ -205,6 +205,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/awt/qt/Makefile.in
diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.117 kaffe/libraries/clib/awt/qt/Makefile.in:1.118
--- kaffe/libraries/clib/awt/qt/Makefile.in:1.117 Sat Feb 4 16:48:16 2006
+++ kaffe/libraries/clib/awt/qt/Makefile.in Tue Feb 7 21:47:43 2006
@@ -206,6 +206,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/io/Makefile.in
diff -u kaffe/libraries/clib/io/Makefile.in:1.167 kaffe/libraries/clib/io/Makefile.in:1.168
--- kaffe/libraries/clib/io/Makefile.in:1.167 Sat Feb 4 16:48:16 2006
+++ kaffe/libraries/clib/io/Makefile.in Tue Feb 7 21:47:44 2006
@@ -194,6 +194,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/management/Makefile.in
diff -u kaffe/libraries/clib/management/Makefile.in:1.171 kaffe/libraries/clib/management/Makefile.in:1.172
--- kaffe/libraries/clib/management/Makefile.in:1.171 Sat Feb 4 16:48:17 2006
+++ kaffe/libraries/clib/management/Makefile.in Tue Feb 7 21:47:45 2006
@@ -193,6 +193,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/math/Makefile.in
diff -u kaffe/libraries/clib/math/Makefile.in:1.166 kaffe/libraries/clib/math/Makefile.in:1.167
--- kaffe/libraries/clib/math/Makefile.in:1.166 Sat Feb 4 16:48:19 2006
+++ kaffe/libraries/clib/math/Makefile.in Tue Feb 7 21:47:46 2006
@@ -192,6 +192,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/native/Makefile.in
diff -u kaffe/libraries/clib/native/Makefile.in:1.214 kaffe/libraries/clib/native/Makefile.in:1.215
--- kaffe/libraries/clib/native/Makefile.in:1.214 Sat Feb 4 16:48:19 2006
+++ kaffe/libraries/clib/native/Makefile.in Tue Feb 7 21:47:48 2006
@@ -215,6 +215,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/net/Makefile.in
diff -u kaffe/libraries/clib/net/Makefile.in:1.176 kaffe/libraries/clib/net/Makefile.in:1.177
--- kaffe/libraries/clib/net/Makefile.in:1.176 Sat Feb 4 16:48:20 2006
+++ kaffe/libraries/clib/net/Makefile.in Tue Feb 7 21:47:49 2006
@@ -197,6 +197,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/nio/Makefile.in
diff -u kaffe/libraries/clib/nio/Makefile.in:1.101 kaffe/libraries/clib/nio/Makefile.in:1.102
--- kaffe/libraries/clib/nio/Makefile.in:1.101 Sat Feb 4 16:48:20 2006
+++ kaffe/libraries/clib/nio/Makefile.in Tue Feb 7 21:47:50 2006
@@ -199,6 +199,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/security/Makefile.in
diff -u kaffe/libraries/clib/security/Makefile.in:1.137 kaffe/libraries/clib/security/Makefile.in:1.138
--- kaffe/libraries/clib/security/Makefile.in:1.137 Sat Feb 4 16:48:20 2006
+++ kaffe/libraries/clib/security/Makefile.in Tue Feb 7 21:47:57 2006
@@ -198,6 +198,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/sound/Makefile.in
diff -u kaffe/libraries/clib/sound/Makefile.in:1.63 kaffe/libraries/clib/sound/Makefile.in:1.64
--- kaffe/libraries/clib/sound/Makefile.in:1.63 Sat Feb 4 16:48:21 2006
+++ kaffe/libraries/clib/sound/Makefile.in Tue Feb 7 21:47:59 2006
@@ -174,6 +174,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/sound/alsa/Makefile.in
diff -u kaffe/libraries/clib/sound/alsa/Makefile.in:1.64 kaffe/libraries/clib/sound/alsa/Makefile.in:1.65
--- kaffe/libraries/clib/sound/alsa/Makefile.in:1.64 Sat Feb 4 16:48:21 2006
+++ kaffe/libraries/clib/sound/alsa/Makefile.in Tue Feb 7 21:48:00 2006
@@ -213,6 +213,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/sound/common/Makefile.in
diff -u kaffe/libraries/clib/sound/common/Makefile.in:1.63 kaffe/libraries/clib/sound/common/Makefile.in:1.64
--- kaffe/libraries/clib/sound/common/Makefile.in:1.63 Sat Feb 4 16:48:22 2006
+++ kaffe/libraries/clib/sound/common/Makefile.in Tue Feb 7 21:48:01 2006
@@ -165,6 +165,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/sound/esd/Makefile.in
diff -u kaffe/libraries/clib/sound/esd/Makefile.in:1.64 kaffe/libraries/clib/sound/esd/Makefile.in:1.65
--- kaffe/libraries/clib/sound/esd/Makefile.in:1.64 Sat Feb 4 16:48:22 2006
+++ kaffe/libraries/clib/sound/esd/Makefile.in Tue Feb 7 21:48:01 2006
@@ -195,6 +195,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/target/Makefile.in
diff -u kaffe/libraries/clib/target/Makefile.in:1.23 kaffe/libraries/clib/target/Makefile.in:1.24
--- kaffe/libraries/clib/target/Makefile.in:1.23 Sat Feb 4 16:48:24 2006
+++ kaffe/libraries/clib/target/Makefile.in Tue Feb 7 21:48:02 2006
@@ -166,6 +166,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/target/Linux/Makefile.in
diff -u kaffe/libraries/clib/target/Linux/Makefile.in:1.23 kaffe/libraries/clib/target/Linux/Makefile.in:1.24
--- kaffe/libraries/clib/target/Linux/Makefile.in:1.23 Sat Feb 4 16:48:24 2006
+++ kaffe/libraries/clib/target/Linux/Makefile.in Tue Feb 7 21:48:02 2006
@@ -157,6 +157,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/target/generic/Makefile.in
diff -u kaffe/libraries/clib/target/generic/Makefile.in:1.23 kaffe/libraries/clib/target/generic/Makefile.in:1.24
--- kaffe/libraries/clib/target/generic/Makefile.in:1.23 Sat Feb 4 16:48:24 2006
+++ kaffe/libraries/clib/target/generic/Makefile.in Tue Feb 7 21:48:02 2006
@@ -157,6 +157,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/clib/zip/Makefile.in
diff -u kaffe/libraries/clib/zip/Makefile.in:1.168 kaffe/libraries/clib/zip/Makefile.in:1.169
--- kaffe/libraries/clib/zip/Makefile.in:1.168 Sat Feb 4 16:48:24 2006
+++ kaffe/libraries/clib/zip/Makefile.in Tue Feb 7 21:48:03 2006
@@ -196,6 +196,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/Makefile.in
diff -u kaffe/libraries/extensions/Makefile.in:1.146 kaffe/libraries/extensions/Makefile.in:1.147
--- kaffe/libraries/extensions/Makefile.in:1.146 Sat Feb 4 16:48:25 2006
+++ kaffe/libraries/extensions/Makefile.in Tue Feb 7 21:48:10 2006
@@ -173,6 +173,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/comm/Makefile.in
diff -u kaffe/libraries/extensions/comm/Makefile.in:1.140 kaffe/libraries/extensions/comm/Makefile.in:1.141
--- kaffe/libraries/extensions/comm/Makefile.in:1.140 Sat Feb 4 16:48:25 2006
+++ kaffe/libraries/extensions/comm/Makefile.in Tue Feb 7 21:48:11 2006
@@ -174,6 +174,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/comm/javalib/Makefile.in
diff -u kaffe/libraries/extensions/comm/javalib/Makefile.in:1.141 kaffe/libraries/extensions/comm/javalib/Makefile.in:1.142
--- kaffe/libraries/extensions/comm/javalib/Makefile.in:1.141 Sat Feb 4 16:48:26 2006
+++ kaffe/libraries/extensions/comm/javalib/Makefile.in Tue Feb 7 21:48:12 2006
@@ -179,6 +179,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/microsoft/Makefile.in
diff -u kaffe/libraries/extensions/microsoft/Makefile.in:1.132 kaffe/libraries/extensions/microsoft/Makefile.in:1.133
--- kaffe/libraries/extensions/microsoft/Makefile.in:1.132 Sat Feb 4 16:48:26 2006
+++ kaffe/libraries/extensions/microsoft/Makefile.in Tue Feb 7 21:48:12 2006
@@ -174,6 +174,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/microsoft/clib/Makefile.in
diff -u kaffe/libraries/extensions/microsoft/clib/Makefile.in:1.136 kaffe/libraries/extensions/microsoft/clib/Makefile.in:1.137
--- kaffe/libraries/extensions/microsoft/clib/Makefile.in:1.136 Sat Feb 4 16:48:27 2006
+++ kaffe/libraries/extensions/microsoft/clib/Makefile.in Tue Feb 7 21:48:13 2006
@@ -190,6 +190,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/microsoft/javalib/Makefile.in
diff -u kaffe/libraries/extensions/microsoft/javalib/Makefile.in:1.134 kaffe/libraries/extensions/microsoft/javalib/Makefile.in:1.135
--- kaffe/libraries/extensions/microsoft/javalib/Makefile.in:1.134 Sat Feb 4 16:48:27 2006
+++ kaffe/libraries/extensions/microsoft/javalib/Makefile.in Tue Feb 7 21:48:14 2006
@@ -179,6 +179,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/pjava/Makefile.in
diff -u kaffe/libraries/extensions/pjava/Makefile.in:1.140 kaffe/libraries/extensions/pjava/Makefile.in:1.141
--- kaffe/libraries/extensions/pjava/Makefile.in:1.140 Sat Feb 4 16:48:29 2006
+++ kaffe/libraries/extensions/pjava/Makefile.in Tue Feb 7 21:48:14 2006
@@ -174,6 +174,7 @@
ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
+FASTJAR = @FASTJAR@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GETOPT_H = @GETOPT_H@
Index: kaffe/libraries/extensions/pjava/javalib/Makefile.in
diff -u kaffe/libraries/extensions/pjava/javalib/Makefile.in:1.141 kaffe/libraries/extensions/pjava/javalib/Makefile.in:1.142
--- kaffe/libraries/extensions/pjava/javalib/Makefile.in:1.141 Sat Feb 4 16:48:29 2006
*** Patch too long, truncated ***
More information about the kaffe
mailing list