[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cairo
detection fixes
Kaffe CVS
cvs-commits at kaffe.org
Thu Feb 10 21:01:24 PST 2005
PatchSet 5520
Date: 2005/02/11 04:56:10
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cairo detection fixes
2005-02-10 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/classpath/Configuration.java.in: New file.
Taken from GNU Classpath.
* libraries/javalib/gnu/classpath/Configuration.java: Removed.
* configure.ac: Added a few configure switches from GNU Classpath,
needed to generate gnu/classpath/Configure.java.
* libraries/javalib/Makefile.am.in: Added generated
gnu/classpath/Configure.java to compiler's parameters.
* libraries/javalib/all.files: Removed gnu/classpath/Configure.java,
as it is no longer a part of the source files.
That setup is absolutely ugly, actually, because it's amazingly hard
to make sure that a java compiler builds both the generated file
and the normal, non-generated sources in the same time invocation,
without using all sorts of undocumented tricks and cheats.
But the necessity to commit this comes from GNU Classpath, as it has
become mandatory in order to merge in the latest cairo detection code.
My only hope is that this split source setup will only have to hang
around in Kaffe for the little remaining time till we're fully merged with
Classpath.
* FAQ/FAQ.classlibrary-compile: Removed section on bootstrapping with kjc.
* include/Makefile.am,
libraries/javalib/rebuildLib.in,
libraries/javalib/awt-implementations/kaffe/Makefile.am,
libraries/javalib/gmp-math/Makefile.am:
Removed references to Klasses.jar.bootstrap.
2005-02-08 Michael Koch <konqueror at gmx.de>
* configure.ac: Define substition variable GTK_CAIRO_ENABLED.
Fix handling of GTK_CAIRO conditional.
* gnu/classpath/Configuration.java.in (GTK_CAIRO_ENABLED):
New constant.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java (static):
Throw error when Cairo support was not enabled during configure time.
Members:
ChangeLog:1.3564->1.3565
Makefile.in:1.201->1.202
configure:1.424->1.425
configure.ac:1.114->1.115
FAQ/FAQ.classlibrary-compile:1.17->1.18
config/Makefile.in:1.171->1.172
config/config.h.in:1.132->1.133
include/Makefile.am:1.89->1.90
include/Makefile.in:1.213->1.214
kaffe/Makefile.in:1.141->1.142
kaffe/jvmpi/Makefile.in:1.63->1.64
kaffe/kaffe/Makefile.in:1.161->1.162
kaffe/kaffeh/Makefile.in:1.141->1.142
kaffe/kaffevm/Makefile.in:1.192->1.193
kaffe/kaffevm/boehm-gc/Makefile.in:1.27->1.28
kaffe/kaffevm/gcj/Makefile.in:1.121->1.122
kaffe/kaffevm/intrp/Makefile.in:1.130->1.131
kaffe/kaffevm/jit/Makefile.in:1.136->1.137
kaffe/kaffevm/jit3/Makefile.in:1.107->1.108
kaffe/kaffevm/jni/Makefile.in:1.33->1.34
kaffe/kaffevm/kaffe-gc/Makefile.in:1.25->1.26
kaffe/kaffevm/systems/Makefile.in:1.129->1.130
kaffe/kaffevm/systems/beos-native/Makefile.in:1.121->1.122
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.127->1.128
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.131->1.132
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.105->1.106
kaffe/kaffevm/verifier/Makefile.in:1.32->1.33
kaffe/man/Makefile.in:1.127->1.128
kaffe/scripts/Makefile.in:1.165->1.166
kaffe/scripts/bat/Makefile.in:1.120->1.121
kaffe/scripts/compat/Makefile.in:1.145->1.146
kaffe/xprof/Makefile.in:1.95->1.96
libraries/Makefile.in:1.124->1.125
libraries/clib/Makefile.in:1.138->1.139
libraries/clib/awt/Makefile.in:1.138->1.139
libraries/clib/awt/X/Makefile.in:1.129->1.130
libraries/clib/awt/classpath-gtk/Makefile.in:1.19->1.20
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.25->1.26
libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.18->1.19
libraries/clib/awt/nano-X/Makefile.in:1.2->1.3
libraries/clib/awt/qt/Makefile.in:1.86->1.87
libraries/clib/classpath/Makefile.in:1.11->1.12
libraries/clib/io/Makefile.in:1.133->1.134
libraries/clib/libxmlj/Makefile.in:1.38->1.39
libraries/clib/management/Makefile.in:1.140->1.141
libraries/clib/math/Makefile.in:1.135->1.136
libraries/clib/native/Makefile.in:1.172->1.173
libraries/clib/net/Makefile.in:1.144->1.145
libraries/clib/nio/Makefile.in:1.62->1.63
libraries/clib/security/Makefile.in:1.106->1.107
libraries/clib/sound/Makefile.in:1.33->1.34
libraries/clib/sound/alsa/Makefile.in:1.34->1.35
libraries/clib/sound/common/Makefile.in:1.33->1.34
libraries/clib/sound/esd/Makefile.in:1.34->1.35
libraries/clib/zip/Makefile.in:1.137->1.138
libraries/extensions/Makefile.in:1.116->1.117
libraries/extensions/comm/Makefile.in:1.110->1.111
libraries/extensions/comm/javalib/Makefile.in:1.111->1.112
libraries/extensions/microsoft/Makefile.in:1.102->1.103
libraries/extensions/microsoft/clib/Makefile.in:1.106->1.107
libraries/extensions/microsoft/javalib/Makefile.in:1.104->1.105
libraries/extensions/pjava/Makefile.in:1.110->1.111
libraries/extensions/pjava/javalib/Makefile.in:1.111->1.112
libraries/extensions/servlet/Makefile.in:1.110->1.111
libraries/extensions/servlet/javalib/Makefile.in:1.111->1.112
libraries/javalib/Makefile.am:1.306->1.307
libraries/javalib/Makefile.am.in:1.34->1.35
libraries/javalib/Makefile.in:1.392->1.393
libraries/javalib/all.files:1.87->1.88
libraries/javalib/bootstrap.classlist:1.70->1.71(DEAD)
libraries/javalib/rebuildLib.in:1.44->1.45
libraries/javalib/awt-implementations/Makefile.in:1.18->1.19
libraries/javalib/awt-implementations/kaffe/Makefile.am:1.4->1.5
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.21->1.22
libraries/javalib/gmp-math/Makefile.am:1.3->1.4
libraries/javalib/gmp-math/Makefile.in:1.23->1.24
libraries/javalib/gnu/classpath/Configuration.java:1.5->1.6(DEAD)
libraries/javalib/gnu/classpath/Configuration.java.in:INITIAL->1.1
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.13->1.14
replace/Makefile.in:1.75->1.76
test/Makefile.in:1.133->1.134
test/internal/Makefile.in:1.98->1.99
test/jni/Makefile.in:1.29->1.30
test/regression/Makefile.in:1.204->1.205
test/regression/compile_time/Makefile.in:1.61->1.62
test/regression/compiler/Makefile.in:1.44->1.45
test/regression/run_time/Makefile.in:1.60->1.61
tools/Makefile.in:1.34->1.35
tools/gjdoc/Makefile.in:1.34->1.35
tools/gjdoc/javalib/Makefile.in:1.44->1.45
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3564 kaffe/ChangeLog:1.3565
--- kaffe/ChangeLog:1.3564 Thu Feb 10 23:25:23 2005
+++ kaffe/ChangeLog Fri Feb 11 04:56:10 2005
@@ -1,5 +1,50 @@
2005-02-10 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/gnu/classpath/Configuration.java.in: New file.
+ Taken from GNU Classpath.
+
+ * libraries/javalib/gnu/classpath/Configuration.java: Removed.
+
+ * configure.ac: Added a few configure switches from GNU Classpath,
+ needed to generate gnu/classpath/Configure.java.
+
+ * libraries/javalib/Makefile.am.in: Added generated
+ gnu/classpath/Configure.java to compiler's parameters.
+
+ * libraries/javalib/all.files: Removed gnu/classpath/Configure.java,
+ as it is no longer a part of the source files.
+
+ That setup is absolutely ugly, actually, because it's amazingly hard
+ to make sure that a java compiler builds both the generated file
+ and the normal, non-generated sources in the same time invocation,
+ without using all sorts of undocumented tricks and cheats.
+
+ But the necessity to commit this comes from GNU Classpath, as it has
+ become mandatory in order to merge in the latest cairo detection code.
+
+ My only hope is that this split source setup will only have to hang
+ around in Kaffe for the little remaining time till we're fully merged with
+ Classpath.
+
+ * FAQ/FAQ.classlibrary-compile: Removed section on bootstrapping with kjc.
+
+ * include/Makefile.am,
+ libraries/javalib/rebuildLib.in,
+ libraries/javalib/awt-implementations/kaffe/Makefile.am,
+ libraries/javalib/gmp-math/Makefile.am:
+ Removed references to Klasses.jar.bootstrap.
+
+ 2005-02-08 Michael Koch <konqueror at gmx.de>
+
+ * configure.ac: Define substition variable GTK_CAIRO_ENABLED.
+ Fix handling of GTK_CAIRO conditional.
+ * gnu/classpath/Configuration.java.in (GTK_CAIRO_ENABLED):
+ New constant.
+ * gnu/java/awt/peer/gtk/GdkGraphics2D.java (static):
+ Throw error when Cairo support was not enabled during configure time.
+
+2005-02-10 Dalibor Topic <robilad at kaffe.org>
+
Resynced with GNU Classpath.
2005-02-08 Michael Koch <konqueror at gmx.de>
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.201 kaffe/Makefile.in:1.202
--- kaffe/Makefile.in:1.201 Tue Feb 8 00:15:01 2005
+++ kaffe/Makefile.in Fri Feb 11 04:56:12 2005
@@ -56,11 +56,12 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
$(srcdir)/project.xml.in $(top_srcdir)/configure \
- $(top_srcdir)/include/kaffe/jni_md.h.in ABOUT-NLS AUTHORS \
- ChangeLog INSTALL TODO scripts/compile scripts/config.guess \
- scripts/config.rpath scripts/config.sub scripts/depcomp \
- scripts/install-sh scripts/ltmain.sh scripts/missing \
- scripts/mkinstalldirs
+ $(top_srcdir)/include/kaffe/jni_md.h.in \
+ $(top_srcdir)/libraries/javalib/gnu/classpath/Configuration.java.in \
+ ABOUT-NLS AUTHORS ChangeLog INSTALL TODO scripts/compile \
+ scripts/config.guess scripts/config.rpath scripts/config.sub \
+ scripts/depcomp scripts/install-sh scripts/ltmain.sh \
+ scripts/missing scripts/mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
@@ -89,7 +90,8 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jni_md.h
-CONFIG_CLEAN_FILES = project.xml project.properties
+CONFIG_CLEAN_FILES = project.xml project.properties \
+ libraries/javalib/gnu/classpath/Configuration.java
SCRIPTS = $(noinst_SCRIPTS)
SOURCES =
DIST_SOURCES =
@@ -195,6 +197,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -213,6 +216,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -236,6 +240,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
@@ -593,6 +598,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
project.properties: $(top_builddir)/config.status $(srcdir)/project.properties.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+libraries/javalib/gnu/classpath/Configuration.java: $(top_builddir)/config.status $(top_srcdir)/libraries/javalib/gnu/classpath/Configuration.java.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -727,7 +734,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time
+ $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Index: kaffe/configure
diff -u kaffe/configure:1.424 kaffe/configure:1.425
--- kaffe/configure:1.424 Tue Feb 8 21:55:10 2005
+++ kaffe/configure Fri Feb 11 04:56:12 2005
@@ -491,7 +491,7 @@
ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
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 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_C 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 GTK_CAIRO_TRUE GTK_CAIRO_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 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 COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE PKG_CONFIG GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS 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 XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE ANTLR_JAR COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS 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 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 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_C 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 GTK_CAIRO_ENABLED GTK_CAIRO_TRUE GTK_CAIRO_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 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 COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE PKG_CONFIG GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS 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 XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE ANTLR_JAR COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS LIBDEBUG INIT_LOAD_LIBRARY BINRELOC_CFLAGS 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 LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1095,6 +1095,10 @@
--disable-xmltest Do not try to compile and run a test LIBXML program
--disable-xslttest Do not try to compile and run a test LIBXSLT program
--enable-gjdoc Enable building of gjdoc
+ --enable-classpath-debug
+ enable classpath's runtime debugging code
+ --enable-classpath-load-library
+ enable to use JNI native methods default=yes
--enable-binreloc compile with binary relocation support
(default=enable when available)
@@ -9949,7 +9953,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9952 "configure"' > conftest.$ac_ext
+ echo '#line 9956 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11306,7 +11310,7 @@
# Provide some information about the compiler.
-echo "$as_me:11309:" \
+echo "$as_me:11313:" \
"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
@@ -12367,11 +12371,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12370: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12374: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12374: \$? = $ac_status" >&5
+ echo "$as_me:12378: \$? = $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
@@ -12610,11 +12614,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12613: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12617: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12617: \$? = $ac_status" >&5
+ echo "$as_me:12621: \$? = $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
@@ -12670,11 +12674,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12673: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12677: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12677: \$? = $ac_status" >&5
+ echo "$as_me:12681: \$? = $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
@@ -14859,7 +14863,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14862 "configure"
+#line 14866 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14957,7 +14961,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14960 "configure"
+#line 14964 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17154,11 +17158,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17157: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17161: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17161: \$? = $ac_status" >&5
+ echo "$as_me:17165: \$? = $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
@@ -17214,11 +17218,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17217: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17221: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17221: \$? = $ac_status" >&5
+ echo "$as_me:17225: \$? = $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
@@ -18579,7 +18583,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18582 "configure"
+#line 18586 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18677,7 +18681,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18680 "configure"
+#line 18684 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19514,11 +19518,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19517: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19521: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19521: \$? = $ac_status" >&5
+ echo "$as_me:19525: \$? = $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
@@ -19574,11 +19578,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19577: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19581: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19581: \$? = $ac_status" >&5
+ echo "$as_me:19585: \$? = $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
@@ -21617,11 +21621,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21620: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21624: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21624: \$? = $ac_status" >&5
+ echo "$as_me:21628: \$? = $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
@@ -21860,11 +21864,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21863: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21867: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21867: \$? = $ac_status" >&5
+ echo "$as_me:21871: \$? = $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
@@ -21920,11 +21924,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21923: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21927: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:21927: \$? = $ac_status" >&5
+ echo "$as_me:21931: \$? = $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
@@ -24109,7 +24113,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 24112 "configure"
+#line 24116 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24207,7 +24211,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 24210 "configure"
+#line 24214 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -44959,16 +44963,24 @@
if test "${enable_gtk_cairo+set}" = set; then
enableval="$enable_gtk_cairo"
case "${enableval}" in
- yes) GTK_CAIRO=yes ;;
- no) GTK_CAIRO=no ;;
- *) GTK_CAIRO=yes ;;
- esac
+ yes) GTK_CAIRO_ENABLED=true ;;
+ no) GTK_CAIRO_ENABLED=false ;;
+ *) GTK_CAIRO_ENABLED=true ;;
+ esac
else
- GTK_CAIRO=no
+ GTK_CAIRO_ENABLED=false
fi;
+if test "x${GTK_CAIRO_ENABLED}" = xtrue; then
+
+cat >>confdefs.h <<\_ACEOF
+#define GTK_CAIRO 1
+_ACEOF
+
+fi
+
-if test "x${enable_gtk_cairo}" = xyes; then
+if test "x${GTK_CAIRO_ENABLED}" = xtrue; then
GTK_CAIRO_TRUE=
GTK_CAIRO_FALSE='#'
else
@@ -51292,6 +51304,44 @@
fi
+# Check whether --enable-classpath-debug or --disable-classpath-debug was given.
+if test "${enable_classpath_debug+set}" = set; then
+ enableval="$enable_classpath_debug"
+ case "${enableval}" in
+ yes)
+ LIBDEBUG="true"
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG 1
+_ACEOF
+
+ ;;
+ no) LIBDEBUG="false" ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-classpath-debug" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-classpath-debug" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+else
+ LIBDEBUG="false"
+fi;
+
+
+# Check whether --enable-classpath-load-library or --disable-classpath-load-library was given.
+if test "${enable_classpath_load_library+set}" = set; then
+ enableval="$enable_classpath_load_library"
+ case "${enableval}" in
+ yes) INIT_LOAD_LIBRARY="true" ;;
+ no) INIT_LOAD_LIBRARY="false" ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-classpath-load-library" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-classpath-load-library" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+else
+ INIT_LOAD_LIBRARY="true"
+fi;
+
+
+
for ac_header in pthread.h
@@ -51993,6 +52043,8 @@
ac_config_files="$ac_config_files kaffe/scripts/compat/Makefile"
+ ac_config_files="$ac_config_files libraries/javalib/gnu/classpath/Configuration.java"
+
ac_config_files="$ac_config_files libraries/javalib/Makefile"
ac_config_files="$ac_config_files libraries/javalib/awt-implementations/Makefile"
@@ -52928,6 +52980,7 @@
"kaffe/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/Makefile" ;;
"kaffe/scripts/bat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/bat/Makefile" ;;
"kaffe/scripts/compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/compat/Makefile" ;;
+ "libraries/javalib/gnu/classpath/Configuration.java" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/gnu/classpath/Configuration.java" ;;
"libraries/javalib/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/Makefile" ;;
"libraries/javalib/awt-implementations/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/awt-implementations/Makefile" ;;
"libraries/javalib/awt-implementations/kaffe/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/awt-implementations/kaffe/Makefile" ;;
@@ -53247,6 +53300,7 @@
s, at LIBOBJS@,$LIBOBJS,;t t
s, at USE_COMPAT_IFADDRS_TRUE@,$USE_COMPAT_IFADDRS_TRUE,;t t
s, at USE_COMPAT_IFADDRS_FALSE@,$USE_COMPAT_IFADDRS_FALSE,;t t
+s, at GTK_CAIRO_ENABLED@,$GTK_CAIRO_ENABLED,;t t
s, at GTK_CAIRO_TRUE@,$GTK_CAIRO_TRUE,;t t
s, at GTK_CAIRO_FALSE@,$GTK_CAIRO_FALSE,;t t
s, at COND_NATIVE_AWT_TRUE@,$COND_NATIVE_AWT_TRUE,;t t
@@ -53311,6 +53365,8 @@
s, at KLIBFLAGS@,$KLIBFLAGS,;t t
s, at KVMBINFLAGS@,$KVMBINFLAGS,;t t
s, at KVMLIBFLAGS@,$KVMLIBFLAGS,;t t
+s, at LIBDEBUG@,$LIBDEBUG,;t t
+s, at INIT_LOAD_LIBRARY@,$INIT_LOAD_LIBRARY,;t t
s, at BINRELOC_CFLAGS@,$BINRELOC_CFLAGS,;t t
s, at ENABLE_BINRELOC_TRUE@,$ENABLE_BINRELOC_TRUE,;t t
s, at ENABLE_BINRELOC_FALSE@,$ENABLE_BINRELOC_FALSE,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.114 kaffe/configure.ac:1.115
--- kaffe/configure.ac:1.114 Tue Feb 8 21:55:17 2005
+++ kaffe/configure.ac Fri Feb 11 04:56:18 2005
@@ -1577,13 +1577,17 @@
dnl ------------------------------------------------------------
AC_ARG_ENABLE([gtk-cairo],
[AS_HELP_STRING(--enable-gtk-cairo,build the cairo Graphics2D implementation on GTK [default=no])],
- [case "${enableval}" in
- yes) GTK_CAIRO=yes ;;
- no) GTK_CAIRO=no ;;
- *) GTK_CAIRO=yes ;;
- esac],
- [GTK_CAIRO=no])
-AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes)
+ [case "${enableval}" in
+ yes) GTK_CAIRO_ENABLED=true ;;
+ no) GTK_CAIRO_ENABLED=false ;;
+ *) GTK_CAIRO_ENABLED=true ;;
+ esac],
+ [GTK_CAIRO_ENABLED=false])
+AC_SUBST(GTK_CAIRO_ENABLED)
+if test "x${GTK_CAIRO_ENABLED}" = xtrue; then
+ AC_DEFINE(GTK_CAIRO, 1, [defined if cairo support was built in])
+fi
+AM_CONDITIONAL(GTK_CAIRO, test "x${GTK_CAIRO_ENABLED}" = xtrue)
dnl -------------------------------------------------------------------------
dnl Configure AWT engine
@@ -2060,6 +2064,42 @@
fi
AC_SUBST(KVMLIBFLAGS)
+dnl -----------------------------------------------------------
+dnl Enable debugging statements at compile time. By default
+dnl these statements should be optimized out of the bytecode
+dnl produced by an optimizing Java compiler and not hinder
+dnl performance because debugging is turned off by default.
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([classpath-debug],
+ [AS_HELP_STRING(--enable-classpath-debug,enable classpath's runtime debugging code)],
+ [case "${enableval}" in
+ yes)
+ LIBDEBUG="true"
+ AC_DEFINE(DEBUG, 1, [Define to 1 if you want classpath's library runtime debugging code enabled])
+ ;;
+ no) LIBDEBUG="false" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-classpath-debug) ;;
+ esac],
+ [LIBDEBUG="false"])
+AC_SUBST(LIBDEBUG)
+
+dnl -----------------------------------------------------------
+dnl Enable execution of all static initializer loadLibrary()
+dnl calls at compile time. By default most people will not
+dnl want to disable this, but some VMs (gcj) don't need or want
+dnl them.
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([classpath-load-library],
+ [AS_HELP_STRING(--enable-classpath-load-library,enable to use JNI native methods [default=yes])],
+ [case "${enableval}" in
+ yes) INIT_LOAD_LIBRARY="true" ;;
+ no) INIT_LOAD_LIBRARY="false" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-classpath-load-library) ;;
+ esac],
+ [INIT_LOAD_LIBRARY="true"])
+AC_SUBST(INIT_LOAD_LIBRARY)
+
+
dnl =========================================================================
dnl Configure Binreloc support
dnl -------------------------------------------------------------------------
@@ -2225,6 +2265,7 @@
AC_CONFIG_FILES([kaffe/scripts/Makefile])
AC_CONFIG_FILES([kaffe/scripts/bat/Makefile])
AC_CONFIG_FILES([kaffe/scripts/compat/Makefile])
+AC_CONFIG_FILES([libraries/javalib/gnu/classpath/Configuration.java])
AC_CONFIG_FILES([libraries/javalib/Makefile])
AC_CONFIG_FILES([libraries/javalib/awt-implementations/Makefile])
AC_CONFIG_FILES([libraries/javalib/awt-implementations/kaffe/Makefile])
Index: kaffe/FAQ/FAQ.classlibrary-compile
diff -u kaffe/FAQ/FAQ.classlibrary-compile:1.17 kaffe/FAQ/FAQ.classlibrary-compile:1.18
--- kaffe/FAQ/FAQ.classlibrary-compile:1.17 Tue Feb 1 16:57:32 2005
+++ kaffe/FAQ/FAQ.classlibrary-compile Fri Feb 11 04:56:19 2005
@@ -100,30 +100,6 @@
If you have managed to compile the class library using any version of
gcj, please write to kaffe at kaffe.org.
-How does the bootstrap process work with kjc?
----------------------------------------------
-
-If you use the default Java compiler, kaffe will use the included kjc
-compiler. Kjc is written in pure java, so kaffe will need to use some
-precompiled classes inorder to be able to run kjc.
-
-These precompiled classes are in the Klasses.jar.bootstrap file. It
-also includes some classes, used by kaffeh to generate include files
-for native methods.
-
-So kaffe will compile its class library using kjc, and create the
-rt.jar file.
-
-How do I add classes to Klasses.jar.bootstrap?
-----------------------------------------------
-
-Just edit the bootstrap.classlist file. It is a list of class
-files. Each entry must to end in '.class'. You can use the '#'
-character to comment out lines.
-
-After you have compiled the class library, run 'make bootstrap' to
-update Klasses.jar.bootstrap.
-
How do I adapt the class library to my needs?
---------------------------------------------
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.171 kaffe/config/Makefile.in:1.172
--- kaffe/config/Makefile.in:1.171 Mon Feb 7 15:46:56 2005
+++ kaffe/config/Makefile.in Fri Feb 11 04:56:19 2005
@@ -164,6 +164,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,6 +183,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -205,6 +207,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.132 kaffe/config/config.h.in:1.133
--- kaffe/config/config.h.in:1.132 Fri Dec 31 11:07:14 2004
+++ kaffe/config/config.h.in Fri Feb 11 04:56:19 2005
@@ -30,6 +30,10 @@
/* sizeof((((struct sockaddr_in *) 0) ->sin_port)) */
#undef COMPILE_VALUE_SIZEOF_SIN_PORT
+/* Define to 1 if you want classpath's library runtime debugging code enabled
+ */
+#undef DEBUG
+
/* Define default KAFFEHOME */
#undef DEFAULT_KAFFEHOME
@@ -39,6 +43,9 @@
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
+
+/* defined if cairo support was built in */
+#undef GTK_CAIRO
/* Define to 1 if you have the `alarm' function. */
#undef HAVE_ALARM
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.89 kaffe/include/Makefile.am:1.90
--- kaffe/include/Makefile.am:1.89 Sun Feb 6 18:45:43 2005
+++ kaffe/include/Makefile.am Fri Feb 11 04:56:20 2005
@@ -18,7 +18,7 @@
# INSTALL_ means: these headers get installed,
# NOINSTALL_ means: they don't get installed.
# _DERIVED_ means: these headers are derived (using
-# kaffeh, from Klasses.jar.bootstrap).
+# kaffeh, from rt.jar).
# _JNI_DERIVED_ means: these headers are derived using kaffeh
# from rt.jar *and* the -jni option is
# set, resulting in JNI-ish method names.
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.213 kaffe/include/Makefile.in:1.214
--- kaffe/include/Makefile.in:1.213 Mon Feb 7 15:46:56 2005
+++ kaffe/include/Makefile.in Fri Feb 11 04:56:20 2005
@@ -180,6 +180,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -198,6 +199,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -221,6 +223,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
@@ -377,7 +380,7 @@
# INSTALL_ means: these headers get installed,
# NOINSTALL_ means: they don't get installed.
# _DERIVED_ means: these headers are derived (using
-# kaffeh, from Klasses.jar.bootstrap).
+# kaffeh, from rt.jar).
# _JNI_DERIVED_ means: these headers are derived using kaffeh
# from rt.jar *and* the -jni option is
# set, resulting in JNI-ish method names.
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.141 kaffe/kaffe/Makefile.in:1.142
--- kaffe/kaffe/Makefile.in:1.141 Mon Feb 7 15:46:58 2005
+++ kaffe/kaffe/Makefile.in Fri Feb 11 04:56:21 2005
@@ -166,6 +166,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -184,6 +185,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -207,6 +209,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.63 kaffe/kaffe/jvmpi/Makefile.in:1.64
--- kaffe/kaffe/jvmpi/Makefile.in:1.63 Mon Feb 7 15:46:58 2005
+++ kaffe/kaffe/jvmpi/Makefile.in Fri Feb 11 04:56:22 2005
@@ -178,6 +178,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -196,6 +197,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -219,6 +221,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.161 kaffe/kaffe/kaffe/Makefile.in:1.162
--- kaffe/kaffe/kaffe/Makefile.in:1.161 Mon Feb 7 15:46:59 2005
+++ kaffe/kaffe/kaffe/Makefile.in Fri Feb 11 04:56:22 2005
@@ -183,6 +183,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -201,6 +202,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -224,6 +226,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.141 kaffe/kaffe/kaffeh/Makefile.in:1.142
--- kaffe/kaffe/kaffeh/Makefile.in:1.141 Mon Feb 7 15:46:59 2005
+++ kaffe/kaffe/kaffeh/Makefile.in Fri Feb 11 04:56:23 2005
@@ -188,6 +188,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -206,6 +207,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -229,6 +231,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.192 kaffe/kaffe/kaffevm/Makefile.in:1.193
--- kaffe/kaffe/kaffevm/Makefile.in:1.192 Tue Feb 8 19:34:05 2005
+++ kaffe/kaffe/kaffevm/Makefile.in Fri Feb 11 04:56:23 2005
@@ -230,6 +230,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -248,6 +249,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -271,6 +273,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
+LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.27 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.28
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.27 Mon Feb 7 15:47:00 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Fri Feb 11 04:56:24 2005
@@ -191,6 +191,7 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +210,7 @@
HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -232,6 +234,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
*** Patch too long, truncated ***
More information about the kaffe
mailing list