[kaffe] CVS kaffe (robilad): use GLIBJ_ZIP throughout the build system

Kaffe CVS cvs-commits at kaffe.org
Sun Aug 20 15:37:53 PDT 2006 

PatchSet 7389 
Date: 2006/08/20 22:27:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
use GLIBJ_ZIP throughout the build system

2006-08-20  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Substitute GLIBJ_ZIP for location of glibj.zip.

        * Makefile.am (BUILD_ENVIRONMENT-make),
        include/Makefile.am,
        libraries/javalib/Makefile.am,
        libraries/javalib/awt-implementations/kaffe/Makefile.am,
        libraries/javalib/dnsjava/Makefile.am,
        libraries/javalib/gmp-math/Makefile.am,
        libraries/javalib/gnu-inet/Makefile.am,
        libraries/javalib/tritonus-sound/Makefile.am,
        libraries/javalib/vmspecific/Makefile.am,
        libraries/javalib/zlib-zip/Makefile.am,
        test/internal/Makefile.am,
        test/jni/Makefile.am,
        tools/gjdoc/javalib/Makefile.am,
        tools/javatools/Makefile.am:
        Use GLIBJ_ZIP.

Members: 
	ChangeLog:1.4891->1.4892 
	Makefile.am:1.113->1.114 
	Makefile.in:1.264->1.265 
	configure:1.567->1.568 
	configure.ac:1.245->1.246 
	config/Makefile.in:1.227->1.228 
	external/Makefile.in:1.18->1.19 
	external/gcc/Makefile.in:1.19->1.20 
	external/gcc/zlib/Makefile.in:1.19->1.20 
	include/Makefile.am:1.133->1.134 
	include/Makefile.in:1.290->1.291 
	kaffe/Makefile.in:1.181->1.182 
	kaffe/jvmpi/Makefile.in:1.105->1.106 
	kaffe/kaffe/Makefile.in:1.203->1.204 
	kaffe/kaffeh/Makefile.in:1.186->1.187 
	kaffe/kaffevm/Makefile.in:1.240->1.241 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.68->1.69 
	kaffe/kaffevm/gcj/Makefile.in:1.161->1.162 
	kaffe/kaffevm/intrp/Makefile.in:1.170->1.171 
	kaffe/kaffevm/jit/Makefile.in:1.180->1.181 
	kaffe/kaffevm/jit3/Makefile.in:1.150->1.151 
	kaffe/kaffevm/jni/Makefile.in:1.74->1.75 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.67->1.68 
	kaffe/kaffevm/systems/Makefile.in:1.170->1.171 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.161->1.162 
	kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.24->1.25 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.167->1.168 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.171->1.172 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.147->1.148 
	kaffe/kaffevm/verifier/Makefile.in:1.73->1.74 
	kaffe/man/Makefile.in:1.168->1.169 
	kaffe/scripts/Makefile.in:1.209->1.210 
	kaffe/scripts/bat/Makefile.in:1.160->1.161 
	kaffe/scripts/compat/Makefile.in:1.187->1.188 
	kaffe/xprof/Makefile.in:1.136->1.137 
	libraries/Makefile.in:1.164->1.165 
	libraries/clib/Makefile.in:1.182->1.183 
	libraries/clib/awt/Makefile.in:1.179->1.180 
	libraries/clib/awt/X/Makefile.in:1.173->1.174 
	libraries/clib/awt/nano-X/Makefile.in:1.45->1.46 
	libraries/clib/awt/qt/Makefile.in:1.127->1.128 
	libraries/clib/io/Makefile.in:1.179->1.180 
	libraries/clib/management/Makefile.in:1.182->1.183 
	libraries/clib/math/Makefile.in:1.176->1.177 
	libraries/clib/native/Makefile.in:1.228->1.229 
	libraries/clib/net/Makefile.in:1.188->1.189 
	libraries/clib/nio/Makefile.in:1.113->1.114 
	libraries/clib/security/Makefile.in:1.148->1.149 
	libraries/clib/sound/Makefile.in:1.73->1.74 
	libraries/clib/sound/alsa/Makefile.in:1.74->1.75 
	libraries/clib/sound/common/Makefile.in:1.73->1.74 
	libraries/clib/sound/esd/Makefile.in:1.74->1.75 
	libraries/clib/target/Makefile.in:1.33->1.34 
	libraries/clib/target/Linux/Makefile.in:1.33->1.34 
	libraries/clib/target/generic/Makefile.in:1.33->1.34 
	libraries/clib/zip/Makefile.in:1.181->1.182 
	libraries/javalib/Makefile.am:1.455->1.456 
	libraries/javalib/Makefile.in:1.570->1.571 
	libraries/javalib/awt-implementations/Makefile.in:1.58->1.59 
	libraries/javalib/awt-implementations/kaffe/Makefile.am:1.22->1.23 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.76->1.77 
	libraries/javalib/dnsjava/Makefile.am:1.2->1.3 
	libraries/javalib/dnsjava/Makefile.in:1.3->1.4 
	libraries/javalib/gmp-math/Makefile.am:1.10->1.11 
	libraries/javalib/gmp-math/Makefile.in:1.66->1.67 
	libraries/javalib/gnu-inet/Makefile.am:1.1->1.2 
	libraries/javalib/gnu-inet/Makefile.in:1.1->1.2 
	libraries/javalib/tritonus-sound/Makefile.am:1.1->1.2 
	libraries/javalib/tritonus-sound/Makefile.in:1.2->1.3 
	libraries/javalib/vmspecific/Makefile.am:1.2->1.3 
	libraries/javalib/vmspecific/Makefile.in:1.2->1.3 
	libraries/javalib/zlib-zip/Makefile.am:1.2->1.3 
	libraries/javalib/zlib-zip/Makefile.in:1.2->1.3 
	replace/Makefile.in:1.123->1.124 
	test/Makefile.in:1.173->1.174 
	test/internal/Makefile.am:1.29->1.30 
	test/internal/Makefile.in:1.146->1.147 
	test/jni/Makefile.am:1.15->1.16 
	test/jni/Makefile.in:1.77->1.78 
	test/regression/Makefile.in:1.249->1.250 
	test/regression/compile_time/Makefile.in:1.101->1.102 
	test/regression/compiler/Makefile.in:1.85->1.86 
	test/regression/run_time/Makefile.in:1.100->1.101 
	tools/Makefile.in:1.75->1.76 
	tools/gjdoc/Makefile.in:1.74->1.75 
	tools/gjdoc/javalib/Makefile.am:1.24->1.25 
	tools/gjdoc/javalib/Makefile.in:1.91->1.92 
	tools/javatools/Makefile.am:1.2->1.3 
	tools/javatools/Makefile.in:1.29->1.30 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4891 kaffe/ChangeLog:1.4892
--- kaffe/ChangeLog:1.4891	Sat Aug 19 22:14:05 2006
+++ kaffe/ChangeLog	Sun Aug 20 22:27:29 2006
@@ -1,3 +1,23 @@
+2006-08-20  Dalibor Topic  <robilad at kaffe.org>
+
+	* configure.ac: Substitute GLIBJ_ZIP for location of glibj.zip.
+
+	* Makefile.am (BUILD_ENVIRONMENT-make),
+	include/Makefile.am,
+	libraries/javalib/Makefile.am,
+	libraries/javalib/awt-implementations/kaffe/Makefile.am,
+	libraries/javalib/dnsjava/Makefile.am,
+	libraries/javalib/gmp-math/Makefile.am,
+	libraries/javalib/gnu-inet/Makefile.am,
+	libraries/javalib/tritonus-sound/Makefile.am,
+	libraries/javalib/vmspecific/Makefile.am,
+	libraries/javalib/zlib-zip/Makefile.am,
+	test/internal/Makefile.am,
+	test/jni/Makefile.am,
+	tools/gjdoc/javalib/Makefile.am,
+	tools/javatools/Makefile.am:
+	Use GLIBJ_ZIP.
+
 2006-08-20  Ito Kazumitsu  <kaz at maczuka.gcd>
 
 	* libraries/clib/net/PlainSocketImpl.c: Changed the wrong name
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.113 kaffe/Makefile.am:1.114
--- kaffe/Makefile.am:1.113	Sun Aug 13 01:46:46 2006
+++ kaffe/Makefile.am	Sun Aug 20 22:27:32 2006
@@ -173,7 +173,7 @@
 		"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
 
 BUILD_ENVIRONMENT-make: Makefile
-	echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(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 BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(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.264 kaffe/Makefile.in:1.265
--- kaffe/Makefile.in:1.264	Sun Aug 13 21:15:26 2006
+++ kaffe/Makefile.in	Sun Aug 20 22:27:32 2006
@@ -203,6 +203,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -277,7 +278,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
@@ -983,7 +983,7 @@
 		"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
 
 BUILD_ENVIRONMENT-make: Makefile
-	echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(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 BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(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.567 kaffe/configure:1.568
--- kaffe/configure:1.567	Mon Aug 14 01:05:50 2006
+++ kaffe/configure	Sun Aug 20 22:27:32 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 Khost_cpu Khost_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 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 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 CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER 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_ZLIB_ZIP_TRUE COND_ZLIB_ZIP_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB 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 KAFFE_CFLAGS KAFFE_CCASFLAGS 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 Khost_cpu Khost_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 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 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 CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE GLIBJ_ZIP JIKESPROG JAVA_COMPILER 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_ZLIB_ZIP_TRUE COND_ZLIB_ZIP_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB 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 KAFFE_CFLAGS KAFFE_CCASFLAGS LTLIBOBJS'
 ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
 
 # Initialize some variables set by options.
@@ -2268,6 +2268,7 @@
 
 
 
+
 # Check whether --with-includes or --without-includes was given.
 if test "${with_includes+set}" = set; then
   withval="$with_includes"
@@ -6189,7 +6190,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6192 "configure"' > conftest.$ac_ext
+  echo '#line 6193 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7566,7 +7567,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:7569:" \
+echo "$as_me:7570:" \
      "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
@@ -8633,11 +8634,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8636: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8637: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8640: \$? = $ac_status" >&5
+   echo "$as_me:8641: \$? = $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.
@@ -8901,11 +8902,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8904: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8905: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8908: \$? = $ac_status" >&5
+   echo "$as_me:8909: \$? = $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.
@@ -9005,11 +9006,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9008: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9009: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9012: \$? = $ac_status" >&5
+   echo "$as_me:9013: \$? = $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
@@ -11350,7 +11351,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11353 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11450,7 +11451,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11453 "configure"
+#line 11454 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13794,11 +13795,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13797: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13798: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13801: \$? = $ac_status" >&5
+   echo "$as_me:13802: \$? = $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.
@@ -13898,11 +13899,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13901: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13902: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13905: \$? = $ac_status" >&5
+   echo "$as_me:13906: \$? = $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
@@ -15468,11 +15469,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15471: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15472: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15475: \$? = $ac_status" >&5
+   echo "$as_me:15476: \$? = $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.
@@ -15572,11 +15573,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15575: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15576: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15579: \$? = $ac_status" >&5
+   echo "$as_me:15580: \$? = $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
@@ -17779,11 +17780,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17782: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17783: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17786: \$? = $ac_status" >&5
+   echo "$as_me:17787: \$? = $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.
@@ -18047,11 +18048,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18050: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18051: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18054: \$? = $ac_status" >&5
+   echo "$as_me:18055: \$? = $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.
@@ -18151,11 +18152,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18154: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18155: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18158: \$? = $ac_status" >&5
+   echo "$as_me:18159: \$? = $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
@@ -25380,6 +25381,9 @@
 
 fi;
 
+
+GLIBJ_ZIP="`pwd`/libraries/javalib/external/classpath/lib/glibj.zip"
+
 case "$with_glibj_zip" in
 "")
 	use_glibj_zip=false
@@ -25394,7 +25398,7 @@
 	;;
 *)
 	use_glibj_zip=true
-	PATH_TO_RT_JAR=$with_glibj_zip
+	GLIBJ_ZIP=$with_glibj_zip
 	;;
 esac;
 
@@ -52452,7 +52456,7 @@
 s, at CREATE_PLUGIN_FALSE@,$CREATE_PLUGIN_FALSE,;t t
 s, at USE_PRECOMPILED_RT_JAR_TRUE@,$USE_PRECOMPILED_RT_JAR_TRUE,;t t
 s, at USE_PRECOMPILED_RT_JAR_FALSE@,$USE_PRECOMPILED_RT_JAR_FALSE,;t t
-s, at PATH_TO_RT_JAR@,$PATH_TO_RT_JAR,;t t
+s, at GLIBJ_ZIP@,$GLIBJ_ZIP,;t t
 s, at JIKESPROG@,$JIKESPROG,;t t
 s, at JAVA_COMPILER@,$JAVA_COMPILER,;t t
 s, at JAVA_LIBS@,$JAVA_LIBS,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.245 kaffe/configure.ac:1.246
--- kaffe/configure.ac:1.245	Mon Aug 14 01:05:57 2006
+++ kaffe/configure.ac	Sun Aug 20 22:27:40 2006
@@ -54,6 +54,7 @@
 esac
 AC_SUBST(abssrcdir)
 
+
 dnl =========================================================================
 dnl Allow specification of header-file and library directories
 dnl -------------------------------------------------------------------------
@@ -821,6 +822,9 @@
 	    AS_HELP_STRING([--with-glibj-zip=ABS.PATH],
 			   [use precompiled kaffe class library]))
 
+
+GLIBJ_ZIP="`pwd`/libraries/javalib/external/classpath/lib/glibj.zip"
+
 case "$with_glibj_zip" in
 "")
 	use_glibj_zip=false
@@ -833,12 +837,12 @@
 	;;
 *)
 	use_glibj_zip=true
-	PATH_TO_RT_JAR=$with_glibj_zip
+	GLIBJ_ZIP=$with_glibj_zip
 	;;
 esac;
 
 AM_CONDITIONAL(USE_PRECOMPILED_RT_JAR, test x$use_glibj_zip = xtrue)
-AC_SUBST(PATH_TO_RT_JAR)
+AC_SUBST(GLIBJ_ZIP)
 
 dnl =========================================================================
 dnl Use ecj
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.227 kaffe/config/Makefile.in:1.228
--- kaffe/config/Makefile.in:1.227	Wed Aug  9 21:26:56 2006
+++ kaffe/config/Makefile.in	Sun Aug 20 22:27:41 2006
@@ -177,6 +177,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -251,7 +252,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/external/Makefile.in
diff -u kaffe/external/Makefile.in:1.18 kaffe/external/Makefile.in:1.19
--- kaffe/external/Makefile.in:1.18	Wed Aug  9 21:26:59 2006
+++ kaffe/external/Makefile.in	Sun Aug 20 22:27:42 2006
@@ -170,6 +170,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -244,7 +245,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/external/gcc/Makefile.in
diff -u kaffe/external/gcc/Makefile.in:1.19 kaffe/external/gcc/Makefile.in:1.20
--- kaffe/external/gcc/Makefile.in:1.19	Wed Aug  9 21:27:00 2006
+++ kaffe/external/gcc/Makefile.in	Sun Aug 20 22:27:42 2006
@@ -170,6 +170,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -244,7 +245,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/external/gcc/zlib/Makefile.in
diff -u kaffe/external/gcc/zlib/Makefile.in:1.19 kaffe/external/gcc/zlib/Makefile.in:1.20
--- kaffe/external/gcc/zlib/Makefile.in:1.19	Wed Aug  9 21:27:04 2006
+++ kaffe/external/gcc/zlib/Makefile.in	Sun Aug 20 22:27:43 2006
@@ -182,6 +182,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -256,7 +257,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.133 kaffe/include/Makefile.am:1.134
--- kaffe/include/Makefile.am:1.133	Sun Aug 13 01:46:55 2006
+++ kaffe/include/Makefile.am	Sun Aug 20 22:27:43 2006
@@ -10,8 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-KLASSES_JAR = $(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
-KAFFEH_CLASSPATH = $(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(top_builddir)/libraries/javalib/zlib-zip/lib:$(top_builddir)/libraries/javalib/tritonus-sound/lib:$(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR)
+KAFFEH_CLASSPATH = $(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(top_builddir)/libraries/javalib/zlib-zip/lib:$(top_builddir)/libraries/javalib/tritonus-sound/lib:$(top_builddir)/libraries/javalib/gmp-math/lib:$(GLIBJ_ZIP)
 
 EXTRA_DIST = distclean-hack \
 		stamp-h2.in
@@ -216,7 +215,7 @@
 	  rm -f stamp-h0all; $(MAKE) DERIVED_HDRS=$@ stamp-h0all; \
 	fi
 
-stamp-h0all: stamp-kaffeh $(KLASSES_JAR)
+stamp-h0all: stamp-kaffeh $(GLIBJ_ZIP)
 ## Then, generate each header file,
 ## but if it does not change, do not touch it
 	@set -e; for f in $(DERIVED_HDRS); do \
@@ -233,7 +232,7 @@
 	@echo timestamp > $@
 
 
-stamp-h1all: stamp-kaffeh $(KLASSES_JAR)
+stamp-h1all: stamp-kaffeh $(GLIBJ_ZIP)
 ## Then, generate each header file,
 ## but if it does not change, do not touch it
 	@set -e; for f in $(JNI_DERIVED_HDRS); do \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.290 kaffe/include/Makefile.in:1.291
--- kaffe/include/Makefile.in:1.290	Sun Aug 13 01:46:55 2006
+++ kaffe/include/Makefile.in	Sun Aug 20 22:27:44 2006
@@ -192,6 +192,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -266,7 +267,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
@@ -366,8 +366,7 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
-KLASSES_JAR = $(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
-KAFFEH_CLASSPATH = $(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(top_builddir)/libraries/javalib/zlib-zip/lib:$(top_builddir)/libraries/javalib/tritonus-sound/lib:$(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR)
+KAFFEH_CLASSPATH = $(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(top_builddir)/libraries/javalib/zlib-zip/lib:$(top_builddir)/libraries/javalib/tritonus-sound/lib:$(top_builddir)/libraries/javalib/gmp-math/lib:$(GLIBJ_ZIP)
 EXTRA_DIST = distclean-hack \
 		stamp-h2.in
 
@@ -836,7 +835,7 @@
 	  rm -f stamp-h0all; $(MAKE) DERIVED_HDRS=$@ stamp-h0all; \
 	fi
 
-stamp-h0all: stamp-kaffeh $(KLASSES_JAR)
+stamp-h0all: stamp-kaffeh $(GLIBJ_ZIP)
 	@set -e; for f in $(DERIVED_HDRS); do \
 	  class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
 	  echo "$(KAFFEH) -classpath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
@@ -850,7 +849,7 @@
 	done
 	@echo timestamp > $@
 
-stamp-h1all: stamp-kaffeh $(KLASSES_JAR)
+stamp-h1all: stamp-kaffeh $(GLIBJ_ZIP)
 	@set -e; for f in $(JNI_DERIVED_HDRS); do \
 	  class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
 	  echo "$(KAFFEH) -jni -classpath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.181 kaffe/kaffe/Makefile.in:1.182
--- kaffe/kaffe/Makefile.in:1.181	Wed Aug  9 21:27:06 2006
+++ kaffe/kaffe/Makefile.in	Sun Aug 20 22:27:45 2006
@@ -178,6 +178,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -252,7 +253,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.105 kaffe/kaffe/jvmpi/Makefile.in:1.106
--- kaffe/kaffe/jvmpi/Makefile.in:1.105	Wed Aug  9 21:27:08 2006
+++ kaffe/kaffe/jvmpi/Makefile.in	Sun Aug 20 22:27:46 2006
@@ -188,6 +188,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -262,7 +263,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.203 kaffe/kaffe/kaffe/Makefile.in:1.204
--- kaffe/kaffe/kaffe/Makefile.in:1.203	Wed Aug  9 21:27:08 2006
+++ kaffe/kaffe/kaffe/Makefile.in	Sun Aug 20 22:27:46 2006
@@ -193,6 +193,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -267,7 +268,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.186 kaffe/kaffe/kaffeh/Makefile.in:1.187
--- kaffe/kaffe/kaffeh/Makefile.in:1.186	Wed Aug  9 21:27:09 2006
+++ kaffe/kaffe/kaffeh/Makefile.in	Sun Aug 20 22:27:47 2006
@@ -202,6 +202,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -276,7 +277,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.240 kaffe/kaffe/kaffevm/Makefile.in:1.241
--- kaffe/kaffe/kaffevm/Makefile.in:1.240	Wed Aug  9 21:27:09 2006
+++ kaffe/kaffe/kaffevm/Makefile.in	Sun Aug 20 22:27:48 2006
@@ -235,6 +235,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -309,7 +310,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.68 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.69
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.68	Wed Aug  9 21:27:10 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in	Sun Aug 20 22:27:48 2006
@@ -201,6 +201,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -275,7 +276,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.161 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.162
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.161	Wed Aug  9 21:27:11 2006
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in	Sun Aug 20 22:27:50 2006
@@ -196,6 +196,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -270,7 +271,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.170 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.170	Wed Aug  9 21:27:12 2006
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in	Sun Aug 20 22:27:51 2006
@@ -187,6 +187,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -261,7 +262,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.180 kaffe/kaffe/kaffevm/jit/Makefile.in:1.181
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.180	Wed Aug  9 21:27:16 2006
+++ kaffe/kaffe/kaffevm/jit/Makefile.in	Sun Aug 20 22:27:51 2006
@@ -193,6 +193,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -267,7 +268,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.150 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.151
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.150	Wed Aug  9 21:27:17 2006
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in	Sun Aug 20 22:27:52 2006
@@ -193,6 +193,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -267,7 +268,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.74 kaffe/kaffe/kaffevm/jni/Makefile.in:1.75
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.74	Wed Aug  9 21:27:18 2006
+++ kaffe/kaffe/kaffevm/jni/Makefile.in	Sun Aug 20 22:27:53 2006
@@ -191,6 +191,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -265,7 +266,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.67 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.68
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.67	Wed Aug  9 21:27:18 2006
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in	Sun Aug 20 22:27:54 2006
@@ -187,6 +187,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -261,7 +262,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.170 kaffe/kaffe/kaffevm/systems/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.170	Wed Aug  9 21:27:18 2006
+++ kaffe/kaffe/kaffevm/systems/Makefile.in	Sun Aug 20 22:27:58 2006
@@ -177,6 +177,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -251,7 +252,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.161 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.162
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.161	Wed Aug  9 21:27:19 2006
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in	Sun Aug 20 22:27:59 2006
@@ -186,6 +186,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -260,7 +261,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.24 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.25
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.24	Wed Aug  9 21:27:20 2006
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in	Sun Aug 20 22:27:59 2006
@@ -181,6 +181,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -255,7 +256,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.167 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.168
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.167	Wed Aug  9 21:27:21 2006
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in	Sun Aug 20 22:28:00 2006
@@ -186,6 +186,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -260,7 +261,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.171 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.172
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.171	Wed Aug  9 21:27:21 2006
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in	Sun Aug 20 22:28:00 2006
@@ -187,6 +187,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -261,7 +262,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.147 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.148
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.147	Wed Aug  9 21:27:22 2006
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Sun Aug 20 22:28:01 2006
@@ -192,6 +192,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -266,7 +267,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.73 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.74
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.73	Wed Aug  9 21:27:23 2006
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in	Sun Aug 20 22:28:04 2006
@@ -188,6 +188,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
 HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
 HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
@@ -262,7 +263,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.168 kaffe/kaffe/man/Makefile.in:1.169
--- kaffe/kaffe/man/Makefile.in:1.168	Wed Aug  9 21:27:23 2006
+++ kaffe/kaffe/man/Makefile.in	Sun Aug 20 22:28:05 2006
@@ -174,6 +174,7 @@
 FFLAGS = @FFLAGS@
 GC_NAME = @GC_NAME@
 GETOPT_H = @GETOPT_H@
+GLIBJ_ZIP = @GLIBJ_ZIP@

*** Patch too long, truncated ***

More information about the kaffe mailing list