PatchSet 6961
Date: 2005/10/25 15:42:43
Author: jserv
Branch: HEAD
Tag: (none)
Log:
2005-10-25 Jim Huang <[EMAIL PROTECTED]>
* libraries/clib/awt/X/Makefile.am: Add XI18N_CFLAGS.
* libraries/clib/awt/X/fnt.c
(Java_java_awt_Toolkit_fntFreeFontMetrics): Fixlet to wrong prototype.
(Java_java_awt_Toolkit_fntGetMaxAdvance): Fix typo.
* libraries/clib/awt/X/toolkit.h: Remove hard-coded KAFFE_I18N macro.
* libraries/javalib/awt-implementations/kaffe/Makefile.am: Fixlet to
kaffeawt.jar generation.
* configure.ac: Introduced new option --disable-xawt-xi18n to turn off
Xi18n handling in Xlib-based AWT backend (enabled by
default).
Members:
AUTHORS:1.5->1.6
ChangeLog:1.4484->1.4485
Makefile.in:1.230->1.231
aclocal.m4:1.129->1.130
configure:1.504->1.505
configure.ac:1.183->1.184
config/Makefile.in:1.197->1.198
include/Makefile.in:1.248->1.249
kaffe/Makefile.in:1.157->1.158
kaffe/jvmpi/Makefile.in:1.81->1.82
kaffe/kaffe/Makefile.in:1.179->1.180
kaffe/kaffeh/Makefile.in:1.158->1.159
kaffe/kaffevm/Makefile.in:1.211->1.212
kaffe/kaffevm/boehm-gc/Makefile.in:1.44->1.45
kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.8->1.9
kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.8->1.9
kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.8->1.9
kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.8->1.9
kaffe/kaffevm/gcj/Makefile.in:1.137->1.138
kaffe/kaffevm/intrp/Makefile.in:1.146->1.147
kaffe/kaffevm/jit/Makefile.in:1.156->1.157
kaffe/kaffevm/jit3/Makefile.in:1.126->1.127
kaffe/kaffevm/jni/Makefile.in:1.50->1.51
kaffe/kaffevm/kaffe-gc/Makefile.in:1.43->1.44
kaffe/kaffevm/systems/Makefile.in:1.145->1.146
kaffe/kaffevm/systems/beos-native/Makefile.in:1.137->1.138
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.143->1.144
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.147->1.148
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.122->1.123
kaffe/kaffevm/verifier/Makefile.in:1.49->1.50
kaffe/man/Makefile.in:1.144->1.145
kaffe/scripts/Makefile.in:1.184->1.185
kaffe/scripts/bat/Makefile.in:1.136->1.137
kaffe/scripts/compat/Makefile.in:1.163->1.164
kaffe/xprof/Makefile.in:1.112->1.113
libltdl/COPYING.LIB:1.6->1.7
libltdl/Makefile.am:1.22->1.23
libltdl/Makefile.in:1.56->1.57
libltdl/aclocal.m4:1.55->1.56
libltdl/config.guess:1.12->1.13
libltdl/config.sub:1.16->1.17
libltdl/configure:1.93->1.94
libltdl/configure.ac:1.3->1.4
libltdl/install-sh:1.13->1.14
libltdl/ltdl.c:1.47->1.48
libltdl/ltdl.h:1.19->1.20
libltdl/ltmain.sh:1.11->1.12
libltdl/missing:1.4->1.5
libraries/Makefile.in:1.140->1.141
libraries/clib/Makefile.in:1.155->1.156
libraries/clib/awt/Makefile.in:1.155->1.156
libraries/clib/awt/X/Makefile.am:1.17->1.18
libraries/clib/awt/X/Makefile.in:1.147->1.148
libraries/clib/awt/X/fnt.c:1.17->1.18
libraries/clib/awt/X/toolkit.h:1.33->1.34
libraries/clib/awt/nano-X/Makefile.in:1.20->1.21
libraries/clib/awt/qt/Makefile.in:1.103->1.104
libraries/clib/classpath/Makefile.in:1.30->1.31
libraries/clib/fdlibm/Makefile.in:1.18->1.19
libraries/clib/io/Makefile.in:1.152->1.153
libraries/clib/management/Makefile.in:1.157->1.158
libraries/clib/math/Makefile.in:1.152->1.153
libraries/clib/native/Makefile.in:1.197->1.198
libraries/clib/net/Makefile.in:1.162->1.163
libraries/clib/nio/Makefile.in:1.85->1.86
libraries/clib/security/Makefile.in:1.123->1.124
libraries/clib/sound/Makefile.in:1.49->1.50
libraries/clib/sound/alsa/Makefile.in:1.50->1.51
libraries/clib/sound/common/Makefile.in:1.49->1.50
libraries/clib/sound/esd/Makefile.in:1.50->1.51
libraries/clib/target/Makefile.in:1.9->1.10
libraries/clib/target/Linux/Makefile.in:1.9->1.10
libraries/clib/target/generic/Makefile.in:1.9->1.10
libraries/clib/zip/Makefile.in:1.154->1.155
libraries/extensions/Makefile.in:1.132->1.133
libraries/extensions/comm/Makefile.in:1.126->1.127
libraries/extensions/comm/javalib/Makefile.in:1.127->1.128
libraries/extensions/microsoft/Makefile.in:1.118->1.119
libraries/extensions/microsoft/clib/Makefile.in:1.122->1.123
libraries/extensions/microsoft/javalib/Makefile.in:1.120->1.121
libraries/extensions/pjava/Makefile.in:1.126->1.127
libraries/extensions/pjava/javalib/Makefile.in:1.127->1.128
libraries/extensions/servlet/Makefile.in:1.126->1.127
libraries/extensions/servlet/javalib/Makefile.in:1.127->1.128
libraries/javalib/Makefile.am:1.400->1.401
libraries/javalib/Makefile.in:1.496->1.497
libraries/javalib/awt-implementations/Makefile.in:1.34->1.35
libraries/javalib/awt-implementations/kaffe/Makefile.am:1.6->1.7
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.38->1.39
libraries/javalib/external/classpath/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/aclocal.m4:1.2->1.3
libraries/javalib/external/classpath/config.guess:1.2->1.3
libraries/javalib/external/classpath/config.sub:1.2->1.3
libraries/javalib/external/classpath/configure:1.2->1.3
libraries/javalib/external/classpath/ltmain.sh:1.2->1.3
libraries/javalib/external/classpath/doc/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/doc/api/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/examples/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/external/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/external/sax/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/include/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/lib/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jawt/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/target/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/resource/Makefile.in:1.2->1.3
libraries/javalib/external/classpath/scripts/Makefile.in:1.2->1.3
libraries/javalib/gmp-math/Makefile.in:1.41->1.42
replace/Makefile.in:1.99->1.100
scripts/compile:1.6->1.7
scripts/config.guess:1.12->1.13
scripts/config.sub:1.11->1.12
scripts/depcomp:1.6->1.7
scripts/install-sh:1.11->1.12
scripts/ltmain.sh:1.10->1.11
scripts/missing:1.5->1.6
scripts/mkinstalldirs:1.5->1.6
test/Makefile.in:1.149->1.150
test/internal/Makefile.in:1.117->1.118
test/jni/Makefile.in:1.52->1.53
test/regression/Makefile.in:1.224->1.225
test/regression/compile_time/Makefile.in:1.77->1.78
test/regression/compiler/Makefile.in:1.61->1.62
test/regression/run_time/Makefile.in:1.76->1.77
tools/Makefile.in:1.51->1.52
tools/gjdoc/Makefile.in:1.50->1.51
tools/gjdoc/javalib/Makefile.in:1.64->1.65
tools/javatools/Makefile.in:1.4->1.5
tools/javatools/javalib/Makefile.in:1.4->1.5
Index: kaffe/AUTHORS
diff -u kaffe/AUTHORS:1.5 kaffe/AUTHORS:1.6
--- kaffe/AUTHORS:1.5 Thu Aug 18 22:50:00 2005
+++ kaffe/AUTHORS Tue Oct 25 15:42:43 2005
@@ -5,12 +5,15 @@
Moses DeJong
Benja Fallenstein
Rob Gonzalez
+Adam Heath
Richard Henderson
+Jim Huang
Kiyo Inaba
Ito Kazumitsu
Helmer Kraemer
Guilhem Lavaux
Peter Mehlitz
+Riccardo Mottola
Alexandre Oliva
Edouard G. Parmelan
Jim Pick
@@ -20,7 +23,5 @@
Patrick A Tullmann
Mark Wielaard
Tim Wilkinson
-Adam Heath
-Riccardo Mottola
... and many others, listed in the ChangeLog* files
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4484 kaffe/ChangeLog:1.4485
--- kaffe/ChangeLog:1.4484 Mon Oct 24 21:36:04 2005
+++ kaffe/ChangeLog Tue Oct 25 15:42:43 2005
@@ -1,3 +1,20 @@
+2005-10-25 Jim Huang <[EMAIL PROTECTED]>
+
+ * libraries/clib/awt/X/Makefile.am: Add XI18N_CFLAGS.
+
+ * libraries/clib/awt/X/fnt.c
+ (Java_java_awt_Toolkit_fntFreeFontMetrics): Fixlet to wrong prototype.
+ (Java_java_awt_Toolkit_fntGetMaxAdvance): Fix typo.
+
+ * libraries/clib/awt/X/toolkit.h: Remove hard-coded KAFFE_I18N macro.
+
+ * libraries/javalib/awt-implementations/kaffe/Makefile.am: Fixlet to
+ kaffeawt.jar generation.
+
+ * configure.ac: Introduced new option --disable-xawt-xi18n to turn off
+ Xi18n handling in Xlib-based AWT backend (enabled by
+ default).
+
2005-10-24 Dalibor Topic <[EMAIL PROTECTED]>
Removed Kaffe's copy of GNU Classpath's libxmlj, since it
@@ -453,7 +470,8 @@
tools/gjdoc/javalib/Makefile.in: Regenerated.
2005-10-02 Riccardo Mottola <[EMAIL PROTECTED]>
- * kaffe/kaffe/kafevm/stat.c :
+
+ * kaffe/kaffe/kafevm/stat.c:
added missing include to sys/time.h properly guarded (for darwin)
2005-10-02 Dalibor Topic <[EMAIL PROTECTED]>
@@ -462,7 +480,7 @@
kaffe/scripts/compat/Makefile.am
Removed appletviewer and javadoc compatilibility scripts.
- *kaffe/scripts/compat/appletviewer.in,
+ * kaffe/scripts/compat/appletviewer.in,
kaffe/scripts/compat/javadoc.in:
Removed. Same scripts exist in normal scripts directory already.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.230 kaffe/Makefile.in:1.231
--- kaffe/Makefile.in:1.230 Mon Oct 24 21:36:12 2005
+++ kaffe/Makefile.in Tue Oct 25 15:42:47 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -301,6 +301,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.129 kaffe/aclocal.m4:1.130
--- kaffe/aclocal.m4:1.129 Mon Oct 24 21:36:12 2005
+++ kaffe/aclocal.m4 Tue Oct 25 15:42:47 2005
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
@@ -28,7 +28,7 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.5])])
+ [AM_AUTOMAKE_VERSION([1.9.6])])
# Figure out how to run the assembler. -*- Autoconf -*-
Index: kaffe/configure
diff -u kaffe/configure:1.504 kaffe/configure:1.505
--- kaffe/configure:1.504 Mon Oct 24 21:36:12 2005
+++ kaffe/configure Tue Oct 25 15:42:48 2005
@@ -492,7 +492,7 @@
ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS
CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor
host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL
AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE
MAY_RUN_PO_FALSE 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_S 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 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 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 COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS
KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE
COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS 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 CLASSPATH_INCLUDES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS
CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor
host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL
AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE
MAY_RUN_PO_FALSE 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_S 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 COND_NATIVE_AWT_TRUE
COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE
COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK
QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE
NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS
COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE
COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE
COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS
PROFILE COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS
KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE
COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS 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 CLASSPATH_INCLUDES LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1096,6 +1096,8 @@
--enable-xscale Enable XScale support
--disable-native-awt disable build of Kaffe's all native AWT backends
(enabled by default)
+ --disable-xawt-xi18n disable build of Xi18n support of Xlib AWT backend
+ (enabled by default)
--disable-alsatest Do not try to compile and run a test Alsa program
--disable-esdtest Do not try to compile and run a test ESD program
--disable-sound Disable javax.sound support
@@ -5933,7 +5935,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5936 "configure"' > conftest.$ac_ext
+ echo '#line 5938 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7286,7 +7288,7 @@
# Provide some information about the compiler.
-echo "$as_me:7289:" \
+echo "$as_me:7291:" \
"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
@@ -8386,11 +8388,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8389: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8391: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8393: \$? = $ac_status" >&5
+ echo "$as_me:8395: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8648,11 +8650,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8651: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8653: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8655: \$? = $ac_status" >&5
+ echo "$as_me:8657: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8710,11 +8712,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8713: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8715: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8717: \$? = $ac_status" >&5
+ echo "$as_me:8719: \$? = $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
@@ -10941,7 +10943,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10944 "configure"
+#line 10946 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11039,7 +11041,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11042 "configure"
+#line 11044 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13289,11 +13291,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13292: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13294: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13296: \$? = $ac_status" >&5
+ echo "$as_me:13298: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13351,11 +13353,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13354: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13356: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13358: \$? = $ac_status" >&5
+ echo "$as_me:13360: \$? = $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
@@ -14713,7 +14715,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14716 "configure"
+#line 14718 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14811,7 +14813,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14814 "configure"
+#line 14816 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15696,11 +15698,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15699: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15703: \$? = $ac_status" >&5
+ echo "$as_me:15705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15758,11 +15760,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15761: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15763: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15765: \$? = $ac_status" >&5
+ echo "$as_me:15767: \$? = $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
@@ -17882,11 +17884,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17885: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17887: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17889: \$? = $ac_status" >&5
+ echo "$as_me:17891: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18144,11 +18146,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18147: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18149: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18151: \$? = $ac_status" >&5
+ echo "$as_me:18153: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18206,11 +18208,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18209: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18211: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18213: \$? = $ac_status" >&5
+ echo "$as_me:18215: \$? = $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
@@ -20437,7 +20439,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20440 "configure"
+#line 20442 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20535,7 +20537,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20538 "configure"
+#line 20540 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -44118,7 +44120,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -44145,7 +44147,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -44159,18 +44161,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -44208,7 +44210,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -46327,6 +46329,22 @@
fi
fi
+# Check whether --enable-xawt-xi18n or --disable-xawt-xi18n was given.
+if test "${enable_xawt_xi18n+set}" = set; then
+ enableval="$enable_xawt_xi18n"
+
+else
+ enable_xawt-i18n=yes
+
+fi;
+
+XI18N_CFLAGS=
+if test x"$enable_xawt-i18n" = xyes; then
+ XI18N_CFLAGS="-DKAFFE_I18N"
+fi
+
+
+
# Check whether --with-kaffe-qt-awt or --without-kaffe-qt-awt was given.
if test "${with_kaffe_qt_awt+set}" = set; then
@@ -46454,7 +46472,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -46481,7 +46499,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -46495,18 +46513,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -46544,7 +46562,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -50207,6 +50225,7 @@
s,@X_LIBS@,$X_LIBS,;t t
s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
s,@AWT_LIBS@,$AWT_LIBS,;t t
+s,@XI18N_CFLAGS@,$XI18N_CFLAGS,;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
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.183 kaffe/configure.ac:1.184
--- kaffe/configure.ac:1.183 Mon Oct 24 21:36:17 2005
+++ kaffe/configure.ac Tue Oct 25 15:42:54 2005
@@ -1738,6 +1738,20 @@
fi
fi
+AC_ARG_ENABLE([xawt-xi18n],
+ AS_HELP_STRING([--disable-xawt-xi18n],
+ [disable build of Xi18n support of Xlib AWT backend (enabled by
default)]),
+ [],
+ [enable_xawt-i18n=yes]
+)
+
+XI18N_CFLAGS=
+if test x"$enable_xawt-i18n" = xyes; then
+ XI18N_CFLAGS="-DKAFFE_I18N"
+fi
+AC_SUBST(XI18N_CFLAGS)
+
+
AC_ARG_WITH([kaffe-qt-awt],
AS_HELP_STRING([--with-kaffe-qt-awt],
[enable build of Kaffe's Qt2/3/embedded-based AWT
engine (not built by default)]),
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.197 kaffe/config/Makefile.in:1.198
--- kaffe/config/Makefile.in:1.197 Mon Oct 24 21:36:18 2005
+++ kaffe/config/Makefile.in Tue Oct 25 15:42:55 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -275,6 +275,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.248 kaffe/include/Makefile.in:1.249
--- kaffe/include/Makefile.in:1.248 Mon Oct 24 21:36:24 2005
+++ kaffe/include/Makefile.in Tue Oct 25 15:42:57 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -290,6 +290,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.157 kaffe/kaffe/Makefile.in:1.158
--- kaffe/kaffe/Makefile.in:1.157 Mon Oct 24 21:36:25 2005
+++ kaffe/kaffe/Makefile.in Tue Oct 25 15:42:58 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -276,6 +276,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.81 kaffe/kaffe/jvmpi/Makefile.in:1.82
--- kaffe/kaffe/jvmpi/Makefile.in:1.81 Mon Oct 24 21:36:26 2005
+++ kaffe/kaffe/jvmpi/Makefile.in Tue Oct 25 15:42:58 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,8 +14,6 @@
@SET_MAKE@
-SOURCES = $(libkaffejvmpi_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -288,6 +286,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.179 kaffe/kaffe/kaffe/Makefile.in:1.180
--- kaffe/kaffe/kaffe/Makefile.in:1.179 Mon Oct 24 21:36:26 2005
+++ kaffe/kaffe/kaffe/Makefile.in Tue Oct 25 15:42:59 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22,8 +22,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SOURCES = $(kaffe_bin_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -293,6 +291,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.158
kaffe/kaffe/kaffeh/Makefile.in:1.159
--- kaffe/kaffe/kaffeh/Makefile.in:1.158 Mon Oct 24 21:36:27 2005
+++ kaffe/kaffe/kaffeh/Makefile.in Tue Oct 25 15:42:59 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,8 +23,6 @@
# of this file.
-SOURCES = $(kaffeh_SOURCES) $(nodist_kaffeh_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -298,6 +296,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.211
kaffe/kaffe/kaffevm/Makefile.in:1.212
--- kaffe/kaffe/kaffevm/Makefile.in:1.211 Mon Oct 24 21:36:28 2005
+++ kaffe/kaffe/kaffevm/Makefile.in Tue Oct 25 15:43:00 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26,8 +26,6 @@
# of this file.
-SOURCES = $(libkaffevm_la_SOURCES) $(nodist_libkaffevm_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -332,6 +330,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.44
kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.45
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.44 Mon Oct 24 21:36:29 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Tue Oct 25 15:43:01 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22,8 +22,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SOURCES = $(libkaffegc_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -301,6 +299,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.8
kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.9
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.8 Sat Oct 22 18:20:35 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in Tue Oct 25 15:43:02 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30,8 +30,6 @@
# Modified by: Grzegorz Jakacki <jakacki at acm dot org>
-
-SOURCES = $(libgc_la_SOURCES) $(EXTRA_libgc_la_SOURCES) $(libgccpp_la_SOURCES)
$(gctest_SOURCES) $(test_cpp_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.8
kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.9
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.8 Sat Oct 22 18:20:35 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4 Tue Oct 25 15:43:02 2005
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
@@ -28,7 +28,7 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.5])])
+ [AM_AUTOMAKE_VERSION([1.9.6])])
# Figure out how to run the assembler. -*- Autoconf -*-
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.8
kaffe/kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.9
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.8 Sat Oct 22
18:20:35 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in Tue Oct 25 15:43:02 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.8
kaffe/kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.9
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.8 Sat Oct 22
18:20:36 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in Tue Oct 25
15:43:02 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.137
kaffe/kaffe/kaffevm/gcj/Makefile.in:1.138
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.137 Mon Oct 24 21:36:29 2005
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Tue Oct 25 15:43:03 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22,8 +22,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SOURCES = $(libgcj_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -296,6 +294,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.146
kaffe/kaffe/kaffevm/intrp/Makefile.in:1.147
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.146 Mon Oct 24 21:36:30 2005
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Tue Oct 25 15:43:03 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22,8 +22,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SOURCES = $(libengine_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -287,6 +285,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.156
kaffe/kaffe/kaffevm/jit/Makefile.in:1.157
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.156 Mon Oct 24 21:36:30 2005
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Tue Oct 25 15:43:04 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22,8 +22,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SOURCES = $(libengine_la_SOURCES) $(nodist_libengine_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -293,6 +291,7 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
+XI18N_CFLAGS = @XI18N_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.126
kaffe/kaffe/kaffevm/jit3/Makefile.in:1.127
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.126 Mon Oct 24 21:36:31 2005
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Tue Oct 25 15:43:05 2005
@@ -1,4 +1,4 @@
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
