[kaffe] CVS kaffe (jserv): Initial implementation of Nano-X AWT backend.
Kaffe CVS
cvs-commits at kaffe.org
Sat Feb 5 10:14:53 PST 2005
PatchSet 5976
Date: 2005/02/05 17:45:51
Author: jserv
Branch: HEAD
Tag: (none)
Log:
Initial implementation of Nano-X AWT backend.
2005-02-05 Jim Huang <jserv at kaffe.org>
* configure.ac,
kaffe/kaffe/Makefile.am,
kaffe/kaffe/main.c,
libraries/clib/awt/Makefile.am,
libraries/clib/awt/nano-X/awt_const.h,
libraries/clib/awt/nano-X/clipboard.
libraries/clib/awt/nano-X/color.c,
libraries/clib/awt/nano-X/event.c,
libraries/clib/awt/nano-X/font.c,
libraries/clib/awt/nano-X/graphics.c,
libraries/clib/awt/nano-X/handler.c,
libraries/clib/awt/nano-X/image.c,
libraries/clib/awt/nano-X/keymap.h,
libraries/clib/awt/nano-X/Makefile.am,
libraries/clib/awt/nano-X/toolkit.c,
libraries/clib/awt/nano-X/toolkit.h,
libraries/clib/awt/nano-X/window.c:
Initial implementation of Nano-X AWT backend.
The work is based on the progress of Sinby Corporatin in
2001, and performs some bug-fixes. Currently, it is proven
to work well with Nano-X 0.90.
Members:
ChangeLog:1.3514->1.3515
Makefile.in:1.198->1.199
configure:1.416->1.417
configure.ac:1.107->1.108
config/Makefile.in:1.169->1.170
include/Makefile.in:1.210->1.211
kaffe/Makefile.in:1.139->1.140
kaffe/jvmpi/Makefile.in:1.61->1.62
kaffe/kaffe/Makefile.am:1.30->1.31
kaffe/kaffe/Makefile.in:1.159->1.160
kaffe/kaffe/main.c:1.76->1.77
kaffe/kaffeh/Makefile.in:1.139->1.140
kaffe/kaffevm/Makefile.in:1.187->1.188
kaffe/kaffevm/boehm-gc/Makefile.in:1.25->1.26
kaffe/kaffevm/gcj/Makefile.in:1.119->1.120
kaffe/kaffevm/intrp/Makefile.in:1.128->1.129
kaffe/kaffevm/jit/Makefile.in:1.134->1.135
kaffe/kaffevm/jit3/Makefile.in:1.105->1.106
kaffe/kaffevm/jni/Makefile.in:1.31->1.32
kaffe/kaffevm/kaffe-gc/Makefile.in:1.22->1.23
kaffe/kaffevm/systems/Makefile.in:1.127->1.128
kaffe/kaffevm/systems/beos-native/Makefile.in:1.119->1.120
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.125->1.126
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.129->1.130
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.101->1.102
kaffe/kaffevm/verifier/Makefile.in:1.30->1.31
kaffe/man/Makefile.in:1.125->1.126
kaffe/scripts/Makefile.in:1.162->1.163
kaffe/scripts/bat/Makefile.in:1.118->1.119
kaffe/scripts/compat/Makefile.in:1.143->1.144
kaffe/xprof/Makefile.in:1.93->1.94
libraries/Makefile.in:1.122->1.123
libraries/clib/Makefile.in:1.136->1.137
libraries/clib/awt/Makefile.am:1.9->1.10
libraries/clib/awt/Makefile.in:1.136->1.137
libraries/clib/awt/X/Makefile.in:1.127->1.128
libraries/clib/awt/classpath-gtk/Makefile.in:1.17->1.18
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.23->1.24
libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.16->1.17
libraries/clib/awt/nano-X/Makefile.am:INITIAL->1.1
libraries/clib/awt/nano-X/Makefile.in:INITIAL->1.1
libraries/clib/awt/nano-X/awt_const.h:INITIAL->1.1
libraries/clib/awt/nano-X/clipboard.c:INITIAL->1.1
libraries/clib/awt/nano-X/color.c:INITIAL->1.1
libraries/clib/awt/nano-X/event.c:INITIAL->1.1
libraries/clib/awt/nano-X/font.c:INITIAL->1.1
libraries/clib/awt/nano-X/graphics.c:INITIAL->1.1
libraries/clib/awt/nano-X/handler.c:INITIAL->1.1
libraries/clib/awt/nano-X/image.c:INITIAL->1.1
libraries/clib/awt/nano-X/keymap.h:INITIAL->1.1
libraries/clib/awt/nano-X/toolkit.c:INITIAL->1.1
libraries/clib/awt/nano-X/toolkit.h:INITIAL->1.1
libraries/clib/awt/nano-X/window.c:INITIAL->1.1
libraries/clib/awt/qt/Makefile.in:INITIAL->1.85
libraries/clib/classpath/Makefile.in:INITIAL->1.10
libraries/clib/io/Makefile.in:INITIAL->1.132
libraries/clib/libxmlj/Makefile.in:INITIAL->1.36
libraries/clib/management/Makefile.in:INITIAL->1.139
libraries/clib/math/Makefile.in:INITIAL->1.134
libraries/clib/native/Makefile.in:INITIAL->1.170
libraries/clib/net/Makefile.in:INITIAL->1.143
libraries/clib/nio/Makefile.in:INITIAL->1.61
libraries/clib/security/Makefile.in:INITIAL->1.105
libraries/clib/sound/Makefile.in:INITIAL->1.32
libraries/clib/sound/alsa/Makefile.in:INITIAL->1.33
libraries/clib/sound/common/Makefile.in:INITIAL->1.32
libraries/clib/sound/esd/Makefile.in:INITIAL->1.33
libraries/clib/zip/Makefile.in:INITIAL->1.136
libraries/extensions/Makefile.in:INITIAL->1.115
libraries/extensions/comm/Makefile.in:INITIAL->1.109
libraries/extensions/comm/javalib/Makefile.in:INITIAL->1.109
libraries/extensions/microsoft/Makefile.in:INITIAL->1.101
libraries/extensions/microsoft/clib/Makefile.in:INITIAL->1.105
libraries/extensions/microsoft/javalib/Makefile.in:INITIAL->1.102
libraries/extensions/pjava/Makefile.in:INITIAL->1.109
libraries/extensions/pjava/javalib/Makefile.in:INITIAL->1.109
libraries/extensions/servlet/Makefile.in:INITIAL->1.109
libraries/extensions/servlet/javalib/Makefile.in:INITIAL->1.109
libraries/javalib/Makefile.in:INITIAL->1.391
libraries/javalib/awt-implementations/Makefile.in:INITIAL->1.17
libraries/javalib/awt-implementations/kaffe/Makefile.in:INITIAL->1.19
libraries/javalib/gmp-math/Makefile.in:INITIAL->1.21
replace/Makefile.in:INITIAL->1.74
test/Makefile.in:INITIAL->1.130
test/awt/WidgetsDemo/tvt.jpg:INITIAL->1.2
test/internal/Makefile.in:INITIAL->1.96
test/jni/Makefile.in:INITIAL->1.28
test/regression/Makefile.in:INITIAL->1.202
test/regression/compile_time/Makefile.in:INITIAL->1.60
test/regression/compiler/Makefile.in:INITIAL->1.42
test/regression/run_time/Makefile.in:INITIAL->1.59
tools/Makefile.in:INITIAL->1.33
tools/gjdoc/Makefile.in:INITIAL->1.33
tools/gjdoc/javalib/Makefile.in:INITIAL->1.43
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3514 kaffe/ChangeLog:1.3515
--- kaffe/ChangeLog:1.3514 Sat Feb 5 14:28:57 2005
+++ kaffe/ChangeLog Sat Feb 5 17:45:51 2005
@@ -1,3 +1,27 @@
+2005-02-05 Jim Huang <jserv at kaffe.org>
+
+ * configure.ac,
+ kaffe/kaffe/Makefile.am,
+ kaffe/kaffe/main.c,
+ libraries/clib/awt/Makefile.am,
+ libraries/clib/awt/nano-X/awt_const.h,
+ libraries/clib/awt/nano-X/clipboard.
+ libraries/clib/awt/nano-X/color.c,
+ libraries/clib/awt/nano-X/event.c,
+ libraries/clib/awt/nano-X/font.c,
+ libraries/clib/awt/nano-X/graphics.c,
+ libraries/clib/awt/nano-X/handler.c,
+ libraries/clib/awt/nano-X/image.c,
+ libraries/clib/awt/nano-X/keymap.h,
+ libraries/clib/awt/nano-X/Makefile.am,
+ libraries/clib/awt/nano-X/toolkit.c,
+ libraries/clib/awt/nano-X/toolkit.h,
+ libraries/clib/awt/nano-X/window.c:
+ Initial implementation of Nano-X AWT backend.
+ The work is based on the progress of Sinby Corporatin in
+ 2001, and performs some bug-fixes. Currently, it is proven
+ to work well with Nano-X 0.90.
+
2005-02-05 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.198 kaffe/Makefile.in:1.199
--- kaffe/Makefile.in:1.198 Fri Jan 28 15:30:57 2005
+++ kaffe/Makefile.in Sat Feb 5 17:45:59 2005
@@ -146,6 +146,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -266,6 +268,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/configure
diff -u kaffe/configure:1.416 kaffe/configure:1.417
--- kaffe/configure:1.416 Thu Feb 3 04:10:13 2005
+++ kaffe/configure Sat Feb 5 17:46:00 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_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 JAVA uudecode JAVAC ANTLR 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_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 JAVA uudecode JAVAC ANTLR 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_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1139,6 +1139,12 @@
--with-kaffe-qt-awt enable build of Kaffe's Qt2/3/embedded-based AWT
engine (not built by default)
--with-qtdir=DIR Qt installation directory default=$QTDIR
+ --with-kaffe-nanox-awt enable build of Kaffe's Nano-X AWT engine (not built
+ by default)
+ --with-nanox-includes=dir
+ Specify NanoX include directory
+ --with-nanox-library=dir
+ Specify NanoX library directory
--without-classpath-gtk-awt
disable build of GNU Classpath's Gtk+-based AWT
engine (built by default)
@@ -9943,7 +9949,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9946 "configure"' > conftest.$ac_ext
+ echo '#line 9952 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11300,7 +11306,7 @@
# Provide some information about the compiler.
-echo "$as_me:11303:" \
+echo "$as_me:11309:" \
"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
@@ -12361,11 +12367,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12364: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12370: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12368: \$? = $ac_status" >&5
+ echo "$as_me:12374: \$? = $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
@@ -12604,11 +12610,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12607: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12613: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12611: \$? = $ac_status" >&5
+ echo "$as_me:12617: \$? = $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
@@ -12664,11 +12670,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12673: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12671: \$? = $ac_status" >&5
+ echo "$as_me:12677: \$? = $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
@@ -14853,7 +14859,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14856 "configure"
+#line 14862 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14951,7 +14957,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14954 "configure"
+#line 14960 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17148,11 +17154,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17151: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17155: \$? = $ac_status" >&5
+ echo "$as_me:17161: \$? = $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
@@ -17208,11 +17214,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17211: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17217: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17215: \$? = $ac_status" >&5
+ echo "$as_me:17221: \$? = $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
@@ -18573,7 +18579,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18576 "configure"
+#line 18582 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18671,7 +18677,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18674 "configure"
+#line 18680 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19508,11 +19514,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19511: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19517: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19515: \$? = $ac_status" >&5
+ echo "$as_me:19521: \$? = $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
@@ -19568,11 +19574,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19571: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19577: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19575: \$? = $ac_status" >&5
+ echo "$as_me:19581: \$? = $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
@@ -21611,11 +21617,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21614: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21618: \$? = $ac_status" >&5
+ echo "$as_me:21624: \$? = $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
@@ -21854,11 +21860,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21857: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21863: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21861: \$? = $ac_status" >&5
+ echo "$as_me:21867: \$? = $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
@@ -21914,11 +21920,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21917: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21923: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:21921: \$? = $ac_status" >&5
+ echo "$as_me:21927: \$? = $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
@@ -24103,7 +24109,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 24106 "configure"
+#line 24112 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24201,7 +24207,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 24204 "configure"
+#line 24210 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -54838,6 +54844,59 @@
fi
+# Check whether --with-kaffe-nanox-awt or --without-kaffe-nanox-awt was given.
+if test "${with_kaffe_nanox_awt+set}" = set; then
+ withval="$with_kaffe_nanox_awt"
+
+else
+ with_kaffe_nanox_awt=no
+
+fi;
+
+
+
+if test x"$with_kaffe_nanox_awt" != x"no"; then
+ COND_KAFFE_NANOX_AWT_TRUE=
+ COND_KAFFE_NANOX_AWT_FALSE='#'
+else
+ COND_KAFFE_NANOX_AWT_TRUE='#'
+ COND_KAFFE_NANOX_AWT_FALSE=
+fi
+
+
+if test x"$enable_native_awt" = x"yes"; then
+ if test x"$with_kaffe_nanox_awt" = x"yes"; then
+
+
+
+# Check whether --with-nanox-include or --without-nanox-include was given.
+if test "${with_nanox_include+set}" = set; then
+ withval="$with_nanox_include"
+ NANOXINC=$withval
+else
+ NANOXINC="/usr/include/microwin"
+fi;
+
+
+# Check whether --with-nanox-library or --without-nanox-library was given.
+if test "${with_nanox_library+set}" = set; then
+ withval="$with_nanox_library"
+ NANOXLIB=$withval
+else
+ NANOXLIB="/usr/lib"
+fi;
+
+ NANOX_CFLAGS="-I${NANOXINC}"
+ AWT_LIBS="-L${NANOXLIB} -lnano-X -lmwengine -lmwdrivers -lmwfonts"
+ AWT_LIBS="$CTLIBS $AWT_LIBS"
+
+
+
+ AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/nano-X/libnanoxawt.la"
+ fi
+fi
+
+
# Check whether --with-classpath-gtk-awt or --without-classpath-gtk-awt was given.
if test "${with_classpath_gtk_awt+set}" = set; then
withval="$with_classpath_gtk_awt"
@@ -58395,7 +58454,7 @@
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
- echo "configure: 58398: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+ echo "configure: 58457: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@@ -58513,7 +58572,7 @@
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
-/* #line 58516 "configure" */
+/* #line 58575 "configure" */
public class Test {
}
EOF
@@ -58550,7 +58609,7 @@
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 58553 "configure" */
+/* [#]line 58612 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@@ -59445,6 +59504,8 @@
ac_config_files="$ac_config_files libraries/clib/awt/qt/Makefile"
+ ac_config_files="$ac_config_files libraries/clib/awt/nano-X/Makefile"
+
ac_config_files="$ac_config_files libraries/clib/sound/Makefile"
ac_config_files="$ac_config_files libraries/clib/sound/alsa/Makefile"
@@ -59802,6 +59863,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${COND_KAFFE_NANOX_AWT_TRUE}" && test -z "${COND_KAFFE_NANOX_AWT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"COND_KAFFE_NANOX_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_KAFFE_NANOX_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
@@ -60360,6 +60428,7 @@
"libraries/clib/awt/classpath-gtk/resource/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/resource/Makefile" ;;
"libraries/clib/awt/X/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/X/Makefile" ;;
"libraries/clib/awt/qt/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/qt/Makefile" ;;
+ "libraries/clib/awt/nano-X/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/nano-X/Makefile" ;;
"libraries/clib/sound/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/sound/Makefile" ;;
"libraries/clib/sound/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/sound/alsa/Makefile" ;;
"libraries/clib/sound/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/sound/common/Makefile" ;;
@@ -60682,6 +60751,9 @@
s, at QT_LDADD@,$QT_LDADD,;t t
s, at QT_GUILINK@,$QT_GUILINK,;t t
s, at QASSISTANTCLIENT_LDADD@,$QASSISTANTCLIENT_LDADD,;t t
+s, at COND_KAFFE_NANOX_AWT_TRUE@,$COND_KAFFE_NANOX_AWT_TRUE,;t t
+s, at COND_KAFFE_NANOX_AWT_FALSE@,$COND_KAFFE_NANOX_AWT_FALSE,;t t
+s, at NANOX_CFLAGS@,$NANOX_CFLAGS,;t t
s, at COND_CLASSPATH_GTK_AWT_TRUE@,$COND_CLASSPATH_GTK_AWT_TRUE,;t t
s, at COND_CLASSPATH_GTK_AWT_FALSE@,$COND_CLASSPATH_GTK_AWT_FALSE,;t t
s, at PKG_CONFIG@,$PKG_CONFIG,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.107 kaffe/configure.ac:1.108
--- kaffe/configure.ac:1.107 Thu Feb 3 04:10:16 2005
+++ kaffe/configure.ac Sat Feb 5 17:46:19 2005
@@ -1697,6 +1697,44 @@
fi
fi
+AC_ARG_WITH([kaffe-nanox-awt],
+ AS_HELP_STRING([--with-kaffe-nanox-awt],
+ [enable build of Kaffe's Nano-X AWT engine (not built by default)]),
+ [],
+ [with_kaffe_nanox_awt=no]
+)
+
+AM_CONDITIONAL(COND_KAFFE_NANOX_AWT, test x"$with_kaffe_nanox_awt" != x"no")
+
+if test x"$enable_native_awt" = x"yes"; then
+ if test x"$with_kaffe_nanox_awt" = x"yes"; then
+
+ dnl -----------------------------------------------------------------------
+ dnl Nano-X AWT support
+ dnl -----------------------------------------------------------------------
+
+ AC_ARG_WITH(nanox-include,
+ AS_HELP_STRING([--with-nanox-includes=dir],
+ [Specify NanoX include directory]),
+ [ NANOXINC=$withval ],
+ [ NANOXINC="/usr/include/microwin" ])
+
+ AC_ARG_WITH(nanox-library,
+ AS_HELP_STRING([--with-nanox-library=dir],
+ [Specify NanoX library directory]),
+ [ NANOXLIB=$withval ],
+ [ NANOXLIB="/usr/lib"])
+
+ NANOX_CFLAGS="-I${NANOXINC}"
+ AWT_LIBS="-L${NANOXLIB} -lnano-X -lmwengine -lmwdrivers -lmwfonts"
+ AWT_LIBS="$CTLIBS $AWT_LIBS"
+ AC_SUBST(NANOX_CFLAGS)
+ AC_SUBST(AWT_LIBS)
+
+ AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/nano-X/libnanoxawt.la"
+ fi
+fi
+
AC_ARG_WITH([classpath-gtk-awt],
AS_HELP_STRING([--without-classpath-gtk-awt],
[disable build of GNU Classpath's Gtk+-based AWT engine (built by default)]),
@@ -2210,6 +2248,7 @@
AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/resource/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/X/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/qt/Makefile])
+AC_CONFIG_FILES([libraries/clib/awt/nano-X/Makefile])
AC_CONFIG_FILES([libraries/clib/sound/Makefile])
AC_CONFIG_FILES([libraries/clib/sound/alsa/Makefile])
AC_CONFIG_FILES([libraries/clib/sound/common/Makefile])
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.169 kaffe/config/Makefile.in:1.170
--- kaffe/config/Makefile.in:1.169 Sun Jan 30 12:31:05 2005
+++ kaffe/config/Makefile.in Sat Feb 5 17:46:23 2005
@@ -115,6 +115,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -235,6 +237,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.210 kaffe/include/Makefile.in:1.211
--- kaffe/include/Makefile.in:1.210 Sun Jan 30 12:42:37 2005
+++ kaffe/include/Makefile.in Sat Feb 5 17:46:26 2005
@@ -131,6 +131,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -251,6 +253,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.139 kaffe/kaffe/Makefile.in:1.140
--- kaffe/kaffe/Makefile.in:1.139 Fri Jan 28 15:31:06 2005
+++ kaffe/kaffe/Makefile.in Sat Feb 5 17:46:28 2005
@@ -117,6 +117,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -237,6 +239,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.61 kaffe/kaffe/jvmpi/Makefile.in:1.62
--- kaffe/kaffe/jvmpi/Makefile.in:1.61 Fri Jan 28 15:31:07 2005
+++ kaffe/kaffe/jvmpi/Makefile.in Sat Feb 5 17:46:31 2005
@@ -129,6 +129,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -249,6 +251,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.30 kaffe/kaffe/kaffe/Makefile.am:1.31
--- kaffe/kaffe/kaffe/Makefile.am:1.30 Wed Feb 2 13:03:01 2005
+++ kaffe/kaffe/kaffe/Makefile.am Sat Feb 5 17:46:34 2005
@@ -24,6 +24,10 @@
INCLUDE_KAFFE_QT_AWT = -DKAFFE_QT_AWT_INCLUDED
endif
+if COND_KAFFE_NANOX_AWT
+INCLUDE_KAFFE_NANOX_AWT = -DKAFFE_NANOX_AWT_INCLUDED
+endif
+
AM_CPPFLAGS = \
-I../kaffevm \
-I$(srcdir)/../kaffevm \
@@ -32,7 +36,9 @@
-I$(top_srcdir)/kaffe/xprof \
-I$(top_srcdir)/kaffe/kaffevm/jni \
-I$(top_builddir)/include \
- $(INCLUDE_KAFFE_X_AWT) $(INCLUDE_KAFFE_QT_AWT)
+ $(INCLUDE_KAFFE_X_AWT) \
+ $(INCLUDE_KAFFE_QT_AWT) \
+ $(INCLUDE_KAFFE_NANOX_AWT)
kaffe_bin_SOURCES = \
main.c \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.159 kaffe/kaffe/kaffe/Makefile.in:1.160
--- kaffe/kaffe/kaffe/Makefile.in:1.159 Wed Feb 2 13:03:01 2005
+++ kaffe/kaffe/kaffe/Makefile.in Sat Feb 5 17:46:34 2005
@@ -134,6 +134,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -254,6 +256,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
@@ -381,6 +384,7 @@
@ENABLE_JVMPI_TRUE at libjvmpi = ../jvmpi/libkaffejvmpi.la
@COND_KAFFE_X_AWT_TRUE at INCLUDE_KAFFE_X_AWT = -DKAFFE_X_AWT_INCLUDED
@COND_KAFFE_QT_AWT_TRUE at INCLUDE_KAFFE_QT_AWT = -DKAFFE_QT_AWT_INCLUDED
+ at COND_KAFFE_NANOX_AWT_TRUE@INCLUDE_KAFFE_NANOX_AWT = -DKAFFE_NANOX_AWT_INCLUDED
AM_CPPFLAGS = \
-I../kaffevm \
-I$(srcdir)/../kaffevm \
@@ -389,7 +393,9 @@
-I$(top_srcdir)/kaffe/xprof \
-I$(top_srcdir)/kaffe/kaffevm/jni \
-I$(top_builddir)/include \
- $(INCLUDE_KAFFE_X_AWT) $(INCLUDE_KAFFE_QT_AWT)
+ $(INCLUDE_KAFFE_X_AWT) \
+ $(INCLUDE_KAFFE_QT_AWT) \
+ $(INCLUDE_KAFFE_NANOX_AWT)
kaffe_bin_SOURCES = \
main.c \
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.76 kaffe/kaffe/kaffe/main.c:1.77
--- kaffe/kaffe/kaffe/main.c:1.76 Sat Feb 5 17:12:07 2005
+++ kaffe/kaffe/kaffe/main.c Sat Feb 5 17:46:34 2005
@@ -523,6 +523,13 @@
prop = setKaffeAWT("kaffe.awt.nativelib=qtawt");
}
#endif
+#ifdef KAFFE_NANOX_AWT_INCLUDED
+ /* Extra option to use kaffe's Nano-X AWT backend.
+ */
+ else if (strncmp(argv[i], "-Xkaffe-nanox-awt", (j=17)) == 0) {
+ prop = setKaffeAWT("kaffe.awt.nativelib=nanoxawt");
+ }
+#endif
#if defined(USE_GMP)
/* Extra option to use gmp for native, fast bignums.
* Only available with binreloc, since binreloc is used to
@@ -941,6 +948,9 @@
#endif
#ifdef KAFFE_QT_AWT_INCLUDED
fprintf(stderr, _(" -Xkaffe-qt-awt Use Kaffe's Qt2/3/Embedded AWT backend\n"));
+#endif
+#ifdef KAFFE_NANOX_AWT_INCLUDED
+ fprintf(stderr, _(" -Xkaffe-nanox-awt Use Kaffe's Nano-X AWT backend\n"));
#endif
fprintf(stderr, _(" * Option currently ignored.\n"
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.139 kaffe/kaffe/kaffeh/Makefile.in:1.140
--- kaffe/kaffe/kaffeh/Makefile.in:1.139 Fri Jan 28 15:31:07 2005
+++ kaffe/kaffe/kaffeh/Makefile.in Sat Feb 5 17:46:37 2005
@@ -139,6 +139,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -259,6 +261,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.187 kaffe/kaffe/kaffevm/Makefile.in:1.188
--- kaffe/kaffe/kaffevm/Makefile.in:1.187 Sun Jan 30 12:42:40 2005
+++ kaffe/kaffe/kaffevm/Makefile.in Sat Feb 5 17:46:38 2005
@@ -181,6 +181,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -301,6 +303,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.25 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.26
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.25 Fri Jan 28 15:31:09 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Sat Feb 5 17:46:42 2005
@@ -142,6 +142,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -262,6 +264,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.119 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.120
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.119 Fri Jan 28 15:31:09 2005
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Sat Feb 5 17:46:45 2005
@@ -137,6 +137,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -257,6 +259,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.128 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.129
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.128 Fri Jan 28 15:31:10 2005
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Sat Feb 5 17:46:49 2005
@@ -127,6 +127,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -247,6 +249,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.134 kaffe/kaffe/kaffevm/jit/Makefile.in:1.135
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.134 Fri Jan 28 15:31:10 2005
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Sat Feb 5 17:46:51 2005
@@ -129,6 +129,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -249,6 +251,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.105 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.106
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.105 Fri Jan 28 15:31:12 2005
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Sat Feb 5 17:46:52 2005
@@ -129,6 +129,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -249,6 +251,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.31 kaffe/kaffe/kaffevm/jni/Makefile.in:1.32
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.31 Fri Jan 28 15:31:12 2005
+++ kaffe/kaffe/kaffevm/jni/Makefile.in Sat Feb 5 17:46:54 2005
@@ -131,6 +131,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -251,6 +253,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.22 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.23
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.22 Fri Jan 28 15:31:13 2005
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Sat Feb 5 17:46:55 2005
@@ -138,6 +138,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -258,6 +260,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.127 kaffe/kaffe/kaffevm/systems/Makefile.in:1.128
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.127 Fri Jan 28 15:31:13 2005
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Sat Feb 5 17:46:57 2005
@@ -116,6 +116,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
+COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_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@
@@ -236,6 +238,7 @@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
+NANOX_CFLAGS = @NANOX_CFLAGS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
NET_LIBS = @NET_LIBS@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.119 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.120
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.119 Fri Jan 28 15:31:14 2005
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Sat Feb 5 17:46:59 2005
@@ -127,6 +127,8 @@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
*** Patch too long, truncated ***
More information about the kaffe
mailing list