PatchSet 5005
Date: 2004/07/24 01:43:27
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed turning off native AWT backends
2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
Fixed disabling of native AWT code.
* Makefile.am (DIRECTORIES_AFTER_RTJAR): Added explicit support
for AWT directories to ensure that disabling of native
directories works.
* libraries/clib/awt/Makefile.am: Added handling of COND_KAFFE_X_AWT,
COND_KAFFE_QT_AWT and COND_CLASSPATH_GTK_AWT.
(SUBDIRS) Use conditional cubdirs.
(DIST_SUBDIRS) List all subdirs here.
* libraries/clib/Makefile.am: Added handling of COND_NATIVE_AWT.
Cleaned up handling of COND_LIBXMLJ to make sure it doesn't include
spaces.
* configure.ac (enable-awt): Changed over to enable-native-awt.
(COND_NATIVE_AWT, COND_KAFFE_X_AWT, COND_KAFFE_QT_AWT,
COND_CLASSPATH_GTK_AWT) New conditionals.
* Makefile.in,
configure,
config/Makefile.in,
include/Makefile.in,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/Makefile.in,
kaffe/kaffevm/boehm-gc/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/Makefile.in,
kaffe/kaffevm/jni/Makefile.in,
kaffe/kaffevm/kaffe-gc/Makefile.in,
kaffe/kaffevm/systems/Makefile.in,
kaffe/kaffevm/systems/beos-native/Makefile.in,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
kaffe/kaffevm/verifier/Makefile.in,
kaffe/man/Makefile.in,
kaffe/scripts/Makefile.in,
kaffe/scripts/bat/Makefile.in,
kaffe/scripts/compat/Makefile.in,
kaffe/xprof/Makefile.in,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/classpath-gtk/Makefile.in,
libraries/clib/awt/classpath-gtk/classpath/Makefile.in,
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
libraries/clib/awt/classpath-gtk/resource/Makefile.in,
libraries/clib/awt/qt/Makefile.in,
libraries/clib/io/Makefile.in,
libraries/clib/libxmlj/Makefile.in,
libraries/clib/management/Makefile.in,
libraries/clib/math/Makefile.in,
libraries/clib/native/Makefile.in,
libraries/clib/net/Makefile.in,
libraries/clib/nio/Makefile.in,
libraries/clib/security/Makefile.in,
libraries/clib/sound/Makefile.in,
libraries/clib/sound/alsa/Makefile.in,
libraries/clib/sound/common/Makefile.in,
libraries/clib/sound/esd/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/extensions/comm/Makefile.in,
libraries/extensions/comm/javalib/Makefile.in,
libraries/extensions/microsoft/Makefile.in,
libraries/extensions/microsoft/clib/Makefile.in,
libraries/extensions/microsoft/javalib/Makefile.in,
libraries/extensions/pjava/Makefile.in,
libraries/extensions/pjava/javalib/Makefile.in,
libraries/extensions/servlet/Makefile.in,
libraries/extensions/servlet/javalib/Makefile.in,
libraries/javalib/Makefile.in,
libraries/javalib/awt-implementations/Makefile.in,
libraries/javalib/awt-implementations/kaffe/Makefile.in,
libraries/javalib/gmp-math/Makefile.in,
replace/Makefile.in,
test/Makefile.in,
test/internal/Makefile.in,
test/jni/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/compiler/Makefile.in,
test/regression/run_time/Makefile.in,
tools/Makefile.in,
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2565->1.2566
Makefile.am:1.76->1.77
Makefile.in:1.174->1.175
configure:1.364->1.365
configure.ac:1.62->1.63
config/Makefile.in:1.149->1.150
include/Makefile.in:1.174->1.175
kaffe/Makefile.in:1.124->1.125
kaffe/jvmpi/Makefile.in:1.46->1.47
kaffe/kaffe/Makefile.in:1.141->1.142
kaffe/kaffeh/Makefile.in:1.123->1.124
kaffe/kaffevm/Makefile.in:1.170->1.171
kaffe/kaffevm/boehm-gc/Makefile.in:1.6->1.7
kaffe/kaffevm/gcj/Makefile.in:1.104->1.105
kaffe/kaffevm/intrp/Makefile.in:1.112->1.113
kaffe/kaffevm/jit/Makefile.in:1.118->1.119
kaffe/kaffevm/jit3/Makefile.in:1.89->1.90
kaffe/kaffevm/jni/Makefile.in:1.16->1.17
kaffe/kaffevm/kaffe-gc/Makefile.in:1.5->1.6
kaffe/kaffevm/systems/Makefile.in:1.112->1.113
kaffe/kaffevm/systems/beos-native/Makefile.in:1.104->1.105
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.110->1.111
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.114->1.115
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.85->1.86
kaffe/kaffevm/verifier/Makefile.in:1.15->1.16
kaffe/man/Makefile.in:1.110->1.111
kaffe/scripts/Makefile.in:1.147->1.148
kaffe/scripts/bat/Makefile.in:1.103->1.104
kaffe/scripts/compat/Makefile.in:1.128->1.129
kaffe/xprof/Makefile.in:1.78->1.79
libraries/Makefile.in:1.107->1.108
libraries/clib/Makefile.am:1.9->1.10
libraries/clib/Makefile.in:1.116->1.117
libraries/clib/awt/Makefile.am:1.7->1.8
libraries/clib/awt/Makefile.in:1.120->1.121
libraries/clib/awt/X/Makefile.in:1.111->1.112
libraries/clib/awt/classpath-gtk/Makefile.in:1.1->1.2
libraries/clib/awt/classpath-gtk/classpath/Makefile.in:1.1->1.2
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.1->1.2
libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.1->1.2
libraries/clib/awt/qt/Makefile.in:1.67->1.68
libraries/clib/io/Makefile.in:1.115->1.116
libraries/clib/libxmlj/Makefile.in:1.19->1.20
libraries/clib/management/Makefile.in:1.123->1.124
libraries/clib/math/Makefile.in:1.118->1.119
libraries/clib/native/Makefile.in:1.151->1.152
libraries/clib/net/Makefile.in:1.127->1.128
libraries/clib/nio/Makefile.in:1.42->1.43
libraries/clib/security/Makefile.in:1.89->1.90
libraries/clib/sound/Makefile.in:1.16->1.17
libraries/clib/sound/alsa/Makefile.in:1.16->1.17
libraries/clib/sound/common/Makefile.in:1.16->1.17
libraries/clib/sound/esd/Makefile.in:1.16->1.17
libraries/clib/zip/Makefile.in:1.120->1.121
libraries/extensions/Makefile.in:1.99->1.100
libraries/extensions/comm/Makefile.in:1.93->1.94
libraries/extensions/comm/javalib/Makefile.in:1.93->1.94
libraries/extensions/microsoft/Makefile.in:1.85->1.86
libraries/extensions/microsoft/clib/Makefile.in:1.89->1.90
libraries/extensions/microsoft/javalib/Makefile.in:1.86->1.87
libraries/extensions/pjava/Makefile.in:1.93->1.94
libraries/extensions/pjava/javalib/Makefile.in:1.93->1.94
libraries/extensions/servlet/Makefile.in:1.93->1.94
libraries/extensions/servlet/javalib/Makefile.in:1.93->1.94
libraries/javalib/Makefile.in:1.279->1.280
libraries/javalib/awt-implementations/Makefile.in:1.1->1.2
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.1->1.2
libraries/javalib/gmp-math/Makefile.in:1.4->1.5
replace/Makefile.in:1.58->1.59
test/Makefile.in:1.114->1.115
test/internal/Makefile.in:1.72->1.73
test/jni/Makefile.in:1.8->1.9
test/regression/Makefile.in:1.182->1.183
test/regression/compile_time/Makefile.in:1.44->1.45
test/regression/compiler/Makefile.in:1.25->1.26
test/regression/run_time/Makefile.in:1.43->1.44
tools/Makefile.in:1.17->1.18
tools/gjdoc/Makefile.in:1.17->1.18
tools/gjdoc/javalib/Makefile.in:1.20->1.21
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2565 kaffe/ChangeLog:1.2566
--- kaffe/ChangeLog:1.2565 Fri Jul 23 17:02:44 2004
+++ kaffe/ChangeLog Sat Jul 24 01:43:27 2004
@@ -1,3 +1,102 @@
+2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Fixed disabling of native AWT code.
+
+ * Makefile.am (DIRECTORIES_AFTER_RTJAR): Added explicit support
+ for AWT directories to ensure that disabling of native
+ directories works.
+
+ * libraries/clib/awt/Makefile.am: Added handling of COND_KAFFE_X_AWT,
+ COND_KAFFE_QT_AWT and COND_CLASSPATH_GTK_AWT.
+ (SUBDIRS) Use conditional cubdirs.
+ (DIST_SUBDIRS) List all subdirs here.
+
+ * libraries/clib/Makefile.am: Added handling of COND_NATIVE_AWT.
+ Cleaned up handling of COND_LIBXMLJ to make sure it doesn't include
+ spaces.
+
+ * configure.ac (enable-awt): Changed over to enable-native-awt.
+ (COND_NATIVE_AWT, COND_KAFFE_X_AWT, COND_KAFFE_QT_AWT,
+ COND_CLASSPATH_GTK_AWT) New conditionals.
+
+ * Makefile.in,
+ configure,
+ config/Makefile.in,
+ include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/boehm-gc/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/jni/Makefile.in,
+ kaffe/kaffevm/kaffe-gc/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/kaffevm/verifier/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/classpath-gtk/Makefile.in,
+ libraries/clib/awt/classpath-gtk/classpath/Makefile.in,
+ libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
+ libraries/clib/awt/classpath-gtk/resource/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/libxmlj/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in,
+ libraries/clib/nio/Makefile.in,
+ libraries/clib/security/Makefile.in,
+ libraries/clib/sound/Makefile.in,
+ libraries/clib/sound/alsa/Makefile.in,
+ libraries/clib/sound/common/Makefile.in,
+ libraries/clib/sound/esd/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/awt-implementations/Makefile.in,
+ libraries/javalib/awt-implementations/kaffe/Makefile.in,
+ libraries/javalib/gmp-math/Makefile.in,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/jni/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/compiler/Makefile.in,
+ test/regression/run_time/Makefile.in,
+ tools/Makefile.in,
+ tools/gjdoc/Makefile.in,
+ tools/gjdoc/javalib/Makefile.in:
+ Regenerated.
+
2004-07-23 Guilhem Lavaux <[EMAIL PROTECTED]>
* config/powerpc/darwin/md.h: Define a symbol called DARWIN
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.76 kaffe/Makefile.am:1.77
--- kaffe/Makefile.am:1.76 Thu Jul 22 00:13:43 2004
+++ kaffe/Makefile.am Sat Jul 24 01:43:29 2004
@@ -192,8 +192,7 @@
DIRECTORIES_AFTER_RTJAR = \
tools \
test \
- $(RUN_PO) \
- libraries/clib/awt
+ $(RUN_PO)
if MAY_RUN_PO
RUN_PO=po
@@ -212,6 +211,19 @@
DIRECTORIES_AFTER_RTJAR += libraries/clib/sound
endif
endif
+
+if COND_NATIVE_AWT
+if COND_KAFFE_X_AWT
+DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/X
+endif
+if COND_KAFFE_QT_AWT
+DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/qt
+endif
+if COND_CLASSPATH_GTK_AWT
+DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/classpath-gtk
+endif
+endif
+
.PHONY: kaffe-build-order
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.174 kaffe/Makefile.in:1.175
--- kaffe/Makefile.in:1.174 Thu Jul 22 19:03:17 2004
+++ kaffe/Makefile.in Sat Jul 24 01:43:29 2004
@@ -49,6 +49,9 @@
@[EMAIL PROTECTED] = libraries/clib/libxmlj
@[EMAIL PROTECTED] = libraries/clib/sound
@COND_SOUND_ALSA_FALSE@@[EMAIL PROTECTED] = libraries/clib/sound
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = libraries/clib/awt/X
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = libraries/clib/awt/qt
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = libraries/clib/awt/classpath-gtk
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
$(srcdir)/project.xml.in $(top_srcdir)/configure \
@@ -128,8 +131,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
@@ -481,9 +492,8 @@
DIRECTORIES_AFTER_RTJAR = \
tools \
test \
- $(RUN_PO) \
- libraries/clib/awt\
-$(am__append_1) $(am__append_2) $(am__append_3)
+ $(RUN_PO)\
+$(am__append_1) $(am__append_2) $(am__append_3) $(am__append_4) $(am__append_5)
$(am__append_6)
@[EMAIL PROTECTED] =
@[EMAIL PROTECTED] = po
all: all-recursive
Index: kaffe/configure
diff -u kaffe/configure:1.364 kaffe/configure:1.365
--- kaffe/configure:1.364 Fri Jul 23 13:45:15 2004
+++ kaffe/configure Sat Jul 24 01:43:30 2004
@@ -490,7 +490,7 @@
#endif"
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 AMTAR install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot 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 SUN_COMPAT_TRUE SUN_COMPAT_FALSE
THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS VM_LIBS GC_NAME
BOEHMGC_SPECIFIC_FLAGS 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
HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE
USE_COMPAT_IFADDRS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS MOC UIC
QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK PKG_CONFIG GTK_CFLAGS GTK_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_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
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
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 subdirs 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 AMTAR install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot 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 SUN_COMPAT_TRUE SUN_COMPAT_FALSE
THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS VM_LIBS GC_NAME
BOEHMGC_SPECIFIC_FLAGS 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
HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE
USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE
COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS
AWT_LIBS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS
QT_LDADD QT_GUILINK COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE
PKG_CONFIG GTK_CFLAGS GTK_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_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 USE_PRECOMPILED_RT_JAR_TRUE
USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR 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 subdirs LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1129,7 +1129,7 @@
--without-kaffe-x-awt disable build of Kaffe's Xlib-based AWT engine
(built by default)
--with-x use the X Window System
- --without-kaffe-qte-awt disable build of Kaffe's Qt2/3/embedded-based AWT
+ --without-kaffe-qt-awt disable build of Kaffe's Qt2/3/embedded-based AWT
engine (built by default)
--with-qtdir=DIR Qt installation directory default=$QTDIR
--without-classpath-gtk-awt
@@ -50447,9 +50447,9 @@
fi
-# Check whether --enable-awt or --disable-awt was given.
-if test "${enable_awt+set}" = set; then
- enableval="$enable_awt"
+# Check whether --enable-native-awt or --disable-native-awt was given.
+if test "${enable_native_awt+set}" = set; then
+ enableval="$enable_native_awt"
else
enable_native_awt=yes
@@ -50458,6 +50458,16 @@
+if test x"$enable_native_awt" != x"no"; then
+ COND_NATIVE_AWT_TRUE=
+ COND_NATIVE_AWT_FALSE='#'
+else
+ COND_NATIVE_AWT_TRUE='#'
+ COND_NATIVE_AWT_FALSE=
+fi
+
+
+
# Check whether --with-kaffe-x-awt or --without-kaffe-x-awt was given.
if test "${with_kaffe_x_awt+set}" = set; then
withval="$with_kaffe_x_awt"
@@ -50467,6 +50477,17 @@
fi;
+
+
+if test x"$with_kaffe_x_awt" != x"no"; then
+ COND_KAFFE_X_AWT_TRUE=
+ COND_KAFFE_X_AWT_FALSE='#'
+else
+ COND_KAFFE_X_AWT_TRUE='#'
+ COND_KAFFE_X_AWT_FALSE=
+fi
+
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_kaffe_x_awt" = x"yes"; then
@@ -52722,15 +52743,26 @@
fi
-# Check whether --with-kaffe-qte-awt or --without-kaffe-qte-awt was given.
-if test "${with_kaffe_qte_awt+set}" = set; then
- withval="$with_kaffe_qte_awt"
+# Check whether --with-kaffe-qt-awt or --without-kaffe-qt-awt was given.
+if test "${with_kaffe_qt_awt+set}" = set; then
+ withval="$with_kaffe_qt_awt"
else
with_kaffe_qt_awt=yes
fi;
+
+
+if test x"$with_kaffe_qt_awt" != x"no"; then
+ COND_KAFFE_QT_AWT_TRUE=
+ COND_KAFFE_QT_AWT_FALSE='#'
+else
+ COND_KAFFE_QT_AWT_TRUE='#'
+ COND_KAFFE_QT_AWT_FALSE=
+fi
+
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_kaffe_qt_awt" = x"yes"; then
@@ -53173,6 +53205,17 @@
fi;
+
+
+if test x"$with_classpath_gtk_awt" != x"no"; then
+ COND_CLASSPATH_GTK_AWT_TRUE=
+ COND_CLASSPATH_GTK_AWT_FALSE='#'
+else
+ COND_CLASSPATH_GTK_AWT_TRUE='#'
+ COND_CLASSPATH_GTK_AWT_FALSE=
+fi
+
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_classpath_gtk_awt" = x"yes"; then
@@ -56035,6 +56078,34 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${COND_NATIVE_AWT_TRUE}" && test -z "${COND_NATIVE_AWT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"COND_NATIVE_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_NATIVE_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${COND_KAFFE_X_AWT_TRUE}" && test -z "${COND_KAFFE_X_AWT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"COND_KAFFE_X_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_KAFFE_X_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${COND_KAFFE_QT_AWT_TRUE}" && test -z "${COND_KAFFE_QT_AWT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"COND_KAFFE_QT_AWT\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_KAFFE_QT_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${COND_CLASSPATH_GTK_AWT_TRUE}" && test -z
"${COND_CLASSPATH_GTK_AWT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"COND_CLASSPATH_GTK_AWT\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_CLASSPATH_GTK_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${COND_SOUND_ALSA_TRUE}" && test -z "${COND_SOUND_ALSA_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"COND_SOUND_ALSA\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -56873,17 +56944,25 @@
s,@LIBOBJS@,$LIBOBJS,;t t
s,@USE_COMPAT_IFADDRS_TRUE@,$USE_COMPAT_IFADDRS_TRUE,;t t
s,@USE_COMPAT_IFADDRS_FALSE@,$USE_COMPAT_IFADDRS_FALSE,;t t
+s,@COND_NATIVE_AWT_TRUE@,$COND_NATIVE_AWT_TRUE,;t t
+s,@COND_NATIVE_AWT_FALSE@,$COND_NATIVE_AWT_FALSE,;t t
+s,@COND_KAFFE_X_AWT_TRUE@,$COND_KAFFE_X_AWT_TRUE,;t t
+s,@COND_KAFFE_X_AWT_FALSE@,$COND_KAFFE_X_AWT_FALSE,;t t
s,@X_CFLAGS@,$X_CFLAGS,;t t
s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
s,@X_LIBS@,$X_LIBS,;t t
s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
s,@AWT_LIBS@,$AWT_LIBS,;t t
+s,@COND_KAFFE_QT_AWT_TRUE@,$COND_KAFFE_QT_AWT_TRUE,;t t
+s,@COND_KAFFE_QT_AWT_FALSE@,$COND_KAFFE_QT_AWT_FALSE,;t t
s,@MOC@,$MOC,;t t
s,@UIC@,$UIC,;t t
s,@QEMBED@,$QEMBED,;t t
s,@QT_CXXFLAGS@,$QT_CXXFLAGS,;t t
s,@QT_LDADD@,$QT_LDADD,;t t
s,@QT_GUILINK@,$QT_GUILINK,;t t
+s,@COND_CLASSPATH_GTK_AWT_TRUE@,$COND_CLASSPATH_GTK_AWT_TRUE,;t t
+s,@COND_CLASSPATH_GTK_AWT_FALSE@,$COND_CLASSPATH_GTK_AWT_FALSE,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
s,@GTK_LIBS@,$GTK_LIBS,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.62 kaffe/configure.ac:1.63
--- kaffe/configure.ac:1.62 Fri Jul 23 13:45:21 2004
+++ kaffe/configure.ac Sat Jul 24 01:43:37 2004
@@ -1469,13 +1469,14 @@
dnl Configure AWT engine
dnl -------------------------------------------------------------------------
-AC_ARG_ENABLE([awt],
+AC_ARG_ENABLE([native-awt],
AS_HELP_STRING([--disable-native-awt],
[disable build of Kaffe's all native AWT backends (enabled by
default)]),
[],
[enable_native_awt=yes]
)
+AM_CONDITIONAL(COND_NATIVE_AWT, test x"$enable_native_awt" != x"no")
AC_ARG_WITH([kaffe-x-awt],
AS_HELP_STRING([--without-kaffe-x-awt],
@@ -1484,6 +1485,8 @@
[with_kaffe_x_awt=yes]
)
+AM_CONDITIONAL(COND_KAFFE_X_AWT, test x"$with_kaffe_x_awt" != x"no")
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_kaffe_x_awt" = x"yes"; then
@@ -1555,13 +1558,15 @@
fi
fi
-AC_ARG_WITH([kaffe-qte-awt],
- AS_HELP_STRING([--without-kaffe-qte-awt],
+AC_ARG_WITH([kaffe-qt-awt],
+ AS_HELP_STRING([--without-kaffe-qt-awt],
[disable build of Kaffe's Qt2/3/embedded-based AWT engine
(built by default)]),
[],
[with_kaffe_qt_awt=yes]
)
+AM_CONDITIONAL(COND_KAFFE_QT_AWT, test x"$with_kaffe_qt_awt" != x"no")
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_kaffe_qt_awt" = x"yes"; then
gw_CHECK_QT
@@ -1576,6 +1581,8 @@
[],
[with_classpath_gtk_awt=yes]
)
+
+AM_CONDITIONAL(COND_CLASSPATH_GTK_AWT, test x"$with_classpath_gtk_awt" != x"no")
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_classpath_gtk_awt" = x"yes"; then
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.149 kaffe/config/Makefile.in:1.150
--- kaffe/config/Makefile.in:1.149 Thu Jul 22 19:03:30 2004
+++ kaffe/config/Makefile.in Sat Jul 24 01:43:40 2004
@@ -100,8 +100,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.174 kaffe/include/Makefile.in:1.175
--- kaffe/include/Makefile.in:1.174 Thu Jul 22 19:03:31 2004
+++ kaffe/include/Makefile.in Sat Jul 24 01:43:41 2004
@@ -109,8 +109,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.124 kaffe/kaffe/Makefile.in:1.125
--- kaffe/kaffe/Makefile.in:1.124 Thu Jul 22 19:03:32 2004
+++ kaffe/kaffe/Makefile.in Sat Jul 24 01:43:41 2004
@@ -102,8 +102,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.46 kaffe/kaffe/jvmpi/Makefile.in:1.47
--- kaffe/kaffe/jvmpi/Makefile.in:1.46 Thu Jul 22 19:03:33 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Sat Jul 24 01:43:42 2004
@@ -109,8 +109,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.141 kaffe/kaffe/kaffe/Makefile.in:1.142
--- kaffe/kaffe/kaffe/Makefile.in:1.141 Thu Jul 22 19:03:35 2004
+++ kaffe/kaffe/kaffe/Makefile.in Sat Jul 24 01:43:43 2004
@@ -120,8 +120,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.123 kaffe/kaffe/kaffeh/Makefile.in:1.124
--- kaffe/kaffe/kaffeh/Makefile.in:1.123 Thu Jul 22 19:03:36 2004
+++ kaffe/kaffe/kaffeh/Makefile.in Sat Jul 24 01:43:45 2004
@@ -129,8 +129,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.170 kaffe/kaffe/kaffevm/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/Makefile.in:1.170 Thu Jul 22 19:03:36 2004
+++ kaffe/kaffe/kaffevm/Makefile.in Sat Jul 24 01:43:45 2004
@@ -171,8 +171,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.6
kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.7
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.6 Fri Jul 23 13:45:22 2004
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Sat Jul 24 01:43:46 2004
@@ -148,8 +148,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.104
kaffe/kaffe/kaffevm/gcj/Makefile.in:1.105
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.104 Thu Jul 22 19:03:38 2004
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Sat Jul 24 01:43:47 2004
@@ -124,8 +124,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.112
kaffe/kaffe/kaffevm/intrp/Makefile.in:1.113
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.112 Thu Jul 22 19:03:40 2004
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Sat Jul 24 01:43:47 2004
@@ -114,8 +114,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.118
kaffe/kaffe/kaffevm/jit/Makefile.in:1.119
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.118 Thu Jul 22 19:03:40 2004
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Sat Jul 24 01:43:49 2004
@@ -121,8 +121,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.89
kaffe/kaffe/kaffevm/jit3/Makefile.in:1.90
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.89 Thu Jul 22 19:03:41 2004
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Sat Jul 24 01:43:50 2004
@@ -121,8 +121,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.16
kaffe/kaffe/kaffevm/jni/Makefile.in:1.17
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.16 Thu Jul 22 19:03:42 2004
+++ kaffe/kaffe/kaffevm/jni/Makefile.in Sat Jul 24 01:43:50 2004
@@ -122,8 +122,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.5
kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.6
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.5 Thu Jul 22 19:03:42 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Sat Jul 24 01:43:51 2004
@@ -119,8 +119,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.112
kaffe/kaffe/kaffevm/systems/Makefile.in:1.113
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.112 Thu Jul 22 19:03:43 2004
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Sat Jul 24 01:43:51 2004
@@ -101,8 +101,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.104
kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.105
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.104 Thu Jul 22 19:03:45
2004
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Sat Jul 24 01:43:52 2004
@@ -114,8 +114,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.110
kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.111
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.110 Thu Jul 22
19:03:45 2004
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in Sat Jul 24 01:43:52
2004
@@ -114,8 +114,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.114
kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.115
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.114 Thu Jul 22 19:03:46
2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in Sat Jul 24 01:43:54
2004
@@ -115,8 +115,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.85
kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.86
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.85 Thu Jul 22 19:03:47
2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Sat Jul 24 01:43:54
2004
@@ -120,8 +120,16 @@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
