PatchSet 4339
Date: 2004/01/15 02:29:19
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Removed all instances of KVER and KAFFEVERSION
2004-01-15 Dalibor Topic <[EMAIL PROTECTED]>
* configure.in:
(KVER, KAFFEVERSION) Removed.
* developers/autogen.sh:
Added --force-missing to automake call.
* include/system.h,
kaffe/jvmpi/Makefile.am,
kaffe/kaffe/main.c,
kaffe/kaffe/version.c,
kaffe/kaffeh/main.c,
kaffe/kaffevm/Makefile.am,
kaffe/kaffevm/systems/beos-native/Makefile.am,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.am,
kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
kaffe/xprof/Makefile.am,
libraries/clib/awt/qt/Makefile.am,
libraries/clib/awt/X/Makefile.am,
libraries/clib/io/Makefile.am,
libraries/clib/math/Makefile.am,
libraries/clib/management/Makefile.am,
libraries/clib/native/Makefile.am,
libraries/clib/net/Makefile.am,
libraries/clib/security/Makefile.am,
libraries/clib/nio/Makefile.am,
libraries/clib/zip/Makefile.am,
libraries/extensions/microsoft/clib/Makefile.am,
libraries/extensions/sound/alsa/Makefile.am,
libraries/extensions/sound/esd/Makefile.am,
kaffe/kaffevm/intrp/machine.c,
kaffe/kaffevm/jit/machine.c,
kaffe/kaffevm/jit3/machine.c:
Replace KVER and KAFFEVERSION with PACKAGE_VERSION.
Remove engine_version.
* kaffe/kaffevm/systems/unix-jthreads/jqueue.h,
kaffe/kaffevm/systems/unix-jthreads/jthread.h:
Replace KVER with HAVE_CONFIG_H.
* Makefile.in,
config/Makefile.in,
config/config.h.in,
configure,
include/Makefile.in,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/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/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/qt/Makefile.in,
libraries/clib/io/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/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/extensions/sound/Makefile.in,
libraries/extensions/sound/alsa/Makefile.in,
libraries/extensions/sound/common/Makefile.in,
libraries/extensions/sound/esd/Makefile.in,
libraries/javalib/Makefile.in,
replace/Makefile.in,
scripts/config.guess,
scripts/config.sub,
scripts/install-sh,
test/Makefile.in,
test/internal/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/run_time/Makefile.in:
Regenerated.
Members:
ChangeLog:1.1926->1.1927
Makefile.in:1.131->1.132
configure:1.280->1.281
configure.in:1.244->1.245
config/Makefile.in:1.112->1.113
config/config.h.in:1.84->1.85
developers/autogen.sh:1.23->1.24
include/Makefile.in:1.136->1.137
include/system.h:1.12->1.13
kaffe/Makefile.in:1.97->1.98
kaffe/jvmpi/Makefile.am:1.4->1.5
kaffe/jvmpi/Makefile.in:1.18->1.19
kaffe/kaffe/Makefile.in:1.111->1.112
kaffe/kaffe/main.c:1.49->1.50
kaffe/kaffe/version.c:1.7->1.8
kaffe/kaffeh/Makefile.in:1.94->1.95
kaffe/kaffeh/main.c:1.12->1.13
kaffe/kaffevm/Makefile.am:1.48->1.49
kaffe/kaffevm/Makefile.in:1.128->1.129
kaffe/kaffevm/gcj/Makefile.in:1.77->1.78
kaffe/kaffevm/intrp/Makefile.in:1.83->1.84
kaffe/kaffevm/intrp/machine.c:1.35->1.36
kaffe/kaffevm/jit/Makefile.in:1.89->1.90
kaffe/kaffevm/jit/machine.c:1.58->1.59
kaffe/kaffevm/jit3/Makefile.in:1.59->1.60
kaffe/kaffevm/jit3/machine.c:1.45->1.46
kaffe/kaffevm/systems/Makefile.in:1.85->1.86
kaffe/kaffevm/systems/beos-native/Makefile.am:1.7->1.8
kaffe/kaffevm/systems/beos-native/Makefile.in:1.76->1.77
kaffe/kaffevm/systems/oskit-pthreads/Makefile.am:1.8->1.9
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.82->1.83
kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.11->1.12
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.85->1.86
kaffe/kaffevm/systems/unix-jthreads/jqueue.h:1.3->1.4
kaffe/kaffevm/systems/unix-jthreads/jthread.h:1.48->1.49
kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.5->1.6
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.55->1.56
kaffe/man/Makefile.in:1.83->1.84
kaffe/scripts/Makefile.in:1.120->1.121
kaffe/scripts/bat/Makefile.in:1.76->1.77
kaffe/scripts/compat/Makefile.in:1.101->1.102
kaffe/xprof/Makefile.am:1.9->1.10
kaffe/xprof/Makefile.in:1.51->1.52
libltdl/config.guess:1.1->1.2
libltdl/config.sub:1.4->1.5
libltdl/install-sh:1.1->1.2
libltdl/missing:1.1->1.2
libltdl/mkinstalldirs:1.1->1.2
libraries/Makefile.in:1.80->1.81
libraries/clib/Makefile.in:1.88->1.89
libraries/clib/awt/Makefile.in:1.93->1.94
libraries/clib/awt/X/Makefile.am:1.10->1.11
libraries/clib/awt/X/Makefile.in:1.83->1.84
libraries/clib/awt/qt/Makefile.am:1.7->1.8
libraries/clib/awt/qt/Makefile.in:1.38->1.39
libraries/clib/io/Makefile.am:1.10->1.11
libraries/clib/io/Makefile.in:1.86->1.87
libraries/clib/management/Makefile.am:1.11->1.12
libraries/clib/management/Makefile.in:1.95->1.96
libraries/clib/math/Makefile.am:1.9->1.10
libraries/clib/math/Makefile.in:1.91->1.92
libraries/clib/native/Makefile.am:1.27->1.28
libraries/clib/native/Makefile.in:1.118->1.119
libraries/clib/net/Makefile.am:1.15->1.16
libraries/clib/net/Makefile.in:1.99->1.100
libraries/clib/nio/Makefile.am:1.2->1.3
libraries/clib/nio/Makefile.in:1.12->1.13
libraries/clib/security/Makefile.am:1.10->1.11
libraries/clib/security/Makefile.in:1.59->1.60
libraries/clib/zip/Makefile.am:1.9->1.10
libraries/clib/zip/Makefile.in:1.93->1.94
libraries/extensions/Makefile.in:1.71->1.72
libraries/extensions/comm/Makefile.in:1.66->1.67
libraries/extensions/comm/javalib/Makefile.in:1.66->1.67
libraries/extensions/microsoft/Makefile.in:1.58->1.59
libraries/extensions/microsoft/clib/Makefile.am:1.5->1.6
libraries/extensions/microsoft/clib/Makefile.in:1.61->1.62
libraries/extensions/microsoft/javalib/Makefile.in:1.59->1.60
libraries/extensions/pjava/Makefile.in:1.66->1.67
libraries/extensions/pjava/javalib/Makefile.in:1.66->1.67
libraries/extensions/servlet/Makefile.in:1.66->1.67
libraries/extensions/servlet/javalib/Makefile.in:1.66->1.67
libraries/extensions/sound/Makefile.in:1.34->1.35
libraries/extensions/sound/alsa/Makefile.am:1.5->1.6
libraries/extensions/sound/alsa/Makefile.in:1.36->1.37
libraries/extensions/sound/common/Makefile.in:1.36->1.37
libraries/extensions/sound/esd/Makefile.am:1.6->1.7
libraries/extensions/sound/esd/Makefile.in:1.36->1.37
libraries/javalib/Makefile.in:1.215->1.216
replace/Makefile.in:1.30->1.31
scripts/config.guess:1.1->1.2
scripts/config.sub:1.1->1.2
scripts/install-sh:1.1->1.2
test/Makefile.in:1.86->1.87
test/internal/Makefile.in:1.44->1.45
test/regression/Makefile.in:1.153->1.154
test/regression/compile_time/Makefile.in:1.14->1.15
test/regression/run_time/Makefile.in:1.15->1.16
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1926 kaffe/ChangeLog:1.1927
--- kaffe/ChangeLog:1.1926 Wed Jan 14 22:58:47 2004
+++ kaffe/ChangeLog Thu Jan 15 02:29:19 2004
@@ -1,3 +1,108 @@
+2004-01-15 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * configure.in:
+ (KVER, KAFFEVERSION) Removed.
+
+ * developers/autogen.sh:
+ Added --force-missing to automake call.
+
+ * include/system.h,
+ kaffe/jvmpi/Makefile.am,
+ kaffe/kaffe/main.c,
+ kaffe/kaffe/version.c,
+ kaffe/kaffeh/main.c,
+ kaffe/kaffevm/Makefile.am,
+ kaffe/kaffevm/systems/beos-native/Makefile.am,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.am,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
+ kaffe/xprof/Makefile.am,
+ libraries/clib/awt/qt/Makefile.am,
+ libraries/clib/awt/X/Makefile.am,
+ libraries/clib/io/Makefile.am,
+ libraries/clib/math/Makefile.am,
+ libraries/clib/management/Makefile.am,
+ libraries/clib/native/Makefile.am,
+ libraries/clib/net/Makefile.am,
+ libraries/clib/security/Makefile.am,
+ libraries/clib/nio/Makefile.am,
+ libraries/clib/zip/Makefile.am,
+ libraries/extensions/microsoft/clib/Makefile.am,
+ libraries/extensions/sound/alsa/Makefile.am,
+ libraries/extensions/sound/esd/Makefile.am,
+ kaffe/kaffevm/intrp/machine.c,
+ kaffe/kaffevm/jit/machine.c,
+ kaffe/kaffevm/jit3/machine.c:
+ Replace KVER and KAFFEVERSION with PACKAGE_VERSION.
+ Remove engine_version.
+
+ * kaffe/kaffevm/systems/unix-jthreads/jqueue.h,
+ kaffe/kaffevm/systems/unix-jthreads/jthread.h:
+ Replace KVER with HAVE_CONFIG_H.
+
+ * Makefile.in,
+ config/Makefile.in,
+ config/config.h.in,
+ configure,
+ include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/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/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/qt/Makefile.in,
+ libraries/clib/io/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/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/extensions/sound/Makefile.in,
+ libraries/extensions/sound/alsa/Makefile.in,
+ libraries/extensions/sound/common/Makefile.in,
+ libraries/extensions/sound/esd/Makefile.in,
+ libraries/javalib/Makefile.in,
+ replace/Makefile.in,
+ scripts/config.guess,
+ scripts/config.sub,
+ scripts/install-sh,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/run_time/Makefile.in:
+ Regenerated.
+
2004-01-14 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffe/version.c
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.131 kaffe/Makefile.in:1.132
--- kaffe/Makefile.in:1.131 Wed Jan 14 22:13:47 2004
+++ kaffe/Makefile.in Thu Jan 15 02:29:21 2004
@@ -189,7 +189,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/configure
diff -u kaffe/configure:1.280 kaffe/configure:1.281
--- kaffe/configure:1.280 Wed Jan 14 22:13:47 2004
+++ kaffe/configure Thu Jan 15 02:29:21 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 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 DNSJAVA_JAR
HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE
CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE
SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C KVER 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 VM_LIBS NET_LIBS ZIP_LIBS
MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS
HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV
USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD
QT_GUILINK AWT_DIR 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
GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR
USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS 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 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 DNSJAVA_JAR
HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE
CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE
SUN_COMPAT_FALSE THREAD_DIR 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 VM_LIBS NET_LIBS ZIP_LIBS
MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS
HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV
USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD
QT_GUILINK AWT_DIR 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
GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR
USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS 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'
# Initialize some variables set by options.
@@ -2099,8 +2099,6 @@
esac
-KVER=$VERSION
-
# Check whether --with-includes or --without-includes was given.
@@ -4409,7 +4407,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4412 "configure"' > conftest.$ac_ext
+ echo '#line 4410 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5759,7 +5757,7 @@
# Provide some information about the compiler.
-echo "$as_me:5762:" \
+echo "$as_me:5760:" \
"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
@@ -6796,11 +6794,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6799: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6797: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6803: \$? = $ac_status" >&5
+ echo "$as_me:6801: \$? = $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
@@ -7028,11 +7026,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7031: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7029: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7035: \$? = $ac_status" >&5
+ echo "$as_me:7033: \$? = $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
@@ -7095,11 +7093,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7098: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7102: \$? = $ac_status" >&5
+ echo "$as_me:7100: \$? = $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
@@ -9213,7 +9211,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9216 "configure"
+#line 9214 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9311,7 +9309,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9314 "configure"
+#line 9312 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11467,11 +11465,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11468: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11474: \$? = $ac_status" >&5
+ echo "$as_me:11472: \$? = $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
@@ -11534,11 +11532,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11537: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11535: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11541: \$? = $ac_status" >&5
+ echo "$as_me:11539: \$? = $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
@@ -12863,7 +12861,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12866 "configure"
+#line 12864 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12961,7 +12959,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12964 "configure"
+#line 12962 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13783,11 +13781,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13786: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13784: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13790: \$? = $ac_status" >&5
+ echo "$as_me:13788: \$? = $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
@@ -13850,11 +13848,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13853: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13851: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13857: \$? = $ac_status" >&5
+ echo "$as_me:13855: \$? = $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
@@ -15816,11 +15814,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15819: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15817: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15823: \$? = $ac_status" >&5
+ echo "$as_me:15821: \$? = $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
@@ -16048,11 +16046,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16051: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16049: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16055: \$? = $ac_status" >&5
+ echo "$as_me:16053: \$? = $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
@@ -16115,11 +16113,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16118: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16116: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16122: \$? = $ac_status" >&5
+ echo "$as_me:16120: \$? = $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
@@ -18233,7 +18231,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18236 "configure"
+#line 18234 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18331,7 +18329,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18334 "configure"
+#line 18332 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20066,12 +20064,6 @@
-
-
-cat >>confdefs.h <<_ACEOF
-#define KAFFEVERSION "$KVER"
-_ACEOF
-
if test x"$program_prefix" = x"NONE" ; then
KPREFIX=""
else
@@ -46542,7 +46534,7 @@
-CPPFLAGS="-DKVER='\"\$(KVER)\"' -I$abssrcdir/kaffe/kaffevm
-I$abssrcdir/kaffe/kaffevm/$with_engine
-I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/config
-I\$(top_srcdir)/include $CPPFLAGS"
+CPPFLAGS="-I$abssrcdir/kaffe/kaffevm -I$abssrcdir/kaffe/kaffevm/$with_engine
-I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/config
-I\$(top_srcdir)/include $CPPFLAGS"
LIBS="$LIBS $LTLIBS"
CFLAGS_WITHOUT_PG=""
@@ -47702,7 +47694,6 @@
s,@JIKESPROG@,$JIKESPROG,;t t
s,@JIKES@,$JIKES,;t t
s,@KAFFEVM_TRAMPOLINES_C@,$KAFFEVM_TRAMPOLINES_C,;t t
-s,@KVER@,$KVER,;t t
s,@JAVA_LIBS@,$JAVA_LIBS,;t t
s,@with_engine@,$with_engine,;t t
s,@THREAD_SYSTEM@,$THREAD_SYSTEM,;t t
Index: kaffe/configure.in
diff -u kaffe/configure.in:1.244 kaffe/configure.in:1.245
--- kaffe/configure.in:1.244 Wed Jan 14 22:13:51 2004
+++ kaffe/configure.in Thu Jan 15 02:29:24 2004
@@ -54,9 +54,6 @@
esac
AC_SUBST(abssrcdir)
-dnl Setup version number.
-KVER=$VERSION
-
dnl =========================================================================
dnl Allow specification of header-file and library directories
dnl -------------------------------------------------------------------------
@@ -543,11 +540,9 @@
dnl Make the necessary substitutions
dnl -------------------------------------------------------------------------
-AC_SUBST(KVER)
AC_SUBST(JAVA_LIBS)
AC_SUBST(with_engine)
AC_SUBST(THREAD_SYSTEM)
-AC_DEFINE_UNQUOTED(KAFFEVERSION, "$KVER", [Kaffe version number])
if test x"$program_prefix" = x"NONE" ; then
KPREFIX=""
else
@@ -1656,7 +1651,7 @@
AC_SUBST(kaffebin_TRANSF)
dnl These are not to be used during configuration, only during build.
-CPPFLAGS="-DKVER='\"\$(KVER)\"' -I$abssrcdir/kaffe/kaffevm
-I$abssrcdir/kaffe/kaffevm/$with_engine
-I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/config
-I\$(top_srcdir)/include $CPPFLAGS"
+CPPFLAGS="-I$abssrcdir/kaffe/kaffevm -I$abssrcdir/kaffe/kaffevm/$with_engine
-I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/config
-I\$(top_srcdir)/include $CPPFLAGS"
LIBS="$LIBS $LTLIBS"
dnl Avoid GNU Make $(filter-out -pg,@CFLAGS@) in kaffe/xprof/Makefile.am
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.112 kaffe/config/Makefile.in:1.113
--- kaffe/config/Makefile.in:1.112 Wed Jan 14 19:41:05 2004
+++ kaffe/config/Makefile.in Thu Jan 15 02:29:27 2004
@@ -165,7 +165,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.84 kaffe/config/config.h.in:1.85
--- kaffe/config/config.h.in:1.84 Sun Jan 11 22:06:52 2004
+++ kaffe/config/config.h.in Thu Jan 15 02:29:27 2004
@@ -605,9 +605,6 @@
/* Define to 1 if `in6addr_loopback' is declared by <netinet/in.h> */
#undef IN6ADDR_LOOPBACK_DECLARED
-/* Kaffe version number */
-#undef KAFFEVERSION
-
/* Define if signal handlers must be reset upon delivery */
#undef KAFFE_SIGNAL_ONE_SHOT
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.23 kaffe/developers/autogen.sh:1.24
--- kaffe/developers/autogen.sh:1.23 Wed Jan 14 19:41:05 2004
+++ kaffe/developers/autogen.sh Thu Jan 15 02:29:27 2004
@@ -110,7 +110,7 @@
aclocal -I m4
autoheader -Wall
-automake --add-missing --copy -Wall || true # ignore warnings
+automake --add-missing --force-missing --copy -Wall || true # ignore warnings
autoconf -Wall
(
@@ -124,7 +124,7 @@
# Need to regenerate things because patching
# screws up timestamps
aclocal -I .
- automake --add-missing --copy -Wall
+ automake --add-missing --force-missing --copy -Wall
touch config-h.in
autoconf -Wall
patch < ../developers/patch-config.sub-superh.diff
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.136 kaffe/include/Makefile.in:1.137
--- kaffe/include/Makefile.in:1.136 Wed Jan 14 19:41:06 2004
+++ kaffe/include/Makefile.in Thu Jan 15 02:29:28 2004
@@ -175,7 +175,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/include/system.h
diff -u kaffe/include/system.h:1.12 kaffe/include/system.h:1.13
--- kaffe/include/system.h:1.12 Sat May 31 06:01:15 2003
+++ kaffe/include/system.h Thu Jan 15 02:29:28 2004
@@ -20,7 +20,7 @@
#define kaffe_vm_specification_version "1.0"
#define kaffe_vm_specification_vendor "Sun Microsystems Inc."
#define kaffe_vm_specification_name "Java Virtual Machine Specification"
-#define kaffe_vm_version KAFFEVERSION
+#define kaffe_vm_version PACKAGE_VERSION
#define kaffe_vm_vendor kaffe_vendor
#define kaffe_vm_name "Kaffe"
#define kaffe_specification_version "1.2"
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.97 kaffe/kaffe/Makefile.in:1.98
--- kaffe/kaffe/Makefile.in:1.97 Wed Jan 14 19:41:06 2004
+++ kaffe/kaffe/Makefile.in Thu Jan 15 02:29:28 2004
@@ -167,7 +167,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/jvmpi/Makefile.am
diff -u kaffe/kaffe/jvmpi/Makefile.am:1.4 kaffe/kaffe/jvmpi/Makefile.am:1.5
--- kaffe/kaffe/jvmpi/Makefile.am:1.4 Wed Aug 6 13:13:32 2003
+++ kaffe/kaffe/jvmpi/Makefile.am Thu Jan 15 02:29:29 2004
@@ -3,7 +3,10 @@
lib_LTLIBRARIES = libkaffejvmpi.la
-libkaffejvmpi_la_LDFLAGS = -export-dynamic -release $(KVER)
+libkaffejvmpi_la_LDFLAGS = \
+ -export-dynamic \
+ -release $(PACKAGE_PERSION)
+
libkaffejvmpi_la_DEPENDENCIES = \
$(LIBLTDL) \
$(top_builddir)/kaffe/kaffevm/libkaffevm.la
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.18 kaffe/kaffe/jvmpi/Makefile.in:1.19
--- kaffe/kaffe/jvmpi/Makefile.in:1.18 Wed Jan 14 19:41:07 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Thu Jan 15 02:29:29 2004
@@ -174,7 +174,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
@@ -301,7 +300,10 @@
with_engine = @with_engine@
AM_CPPFLAGS = -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) $(ENGINE_INCLUDES)
-I$(top_srcdir)/libltdl $(ENGINE_DEFS) -I$(top_srcdir)/kaffe/kaffevm
-I$(top_builddir)/include
lib_LTLIBRARIES = libkaffejvmpi.la
-libkaffejvmpi_la_LDFLAGS = -export-dynamic -release $(KVER)
+libkaffejvmpi_la_LDFLAGS = \
+ -export-dynamic \
+ -release $(PACKAGE_PERSION)
+
libkaffejvmpi_la_DEPENDENCIES = \
$(LIBLTDL) \
$(top_builddir)/kaffe/kaffevm/libkaffevm.la
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.111 kaffe/kaffe/kaffe/Makefile.in:1.112
--- kaffe/kaffe/kaffe/Makefile.in:1.111 Wed Jan 14 19:41:07 2004
+++ kaffe/kaffe/kaffe/Makefile.in Thu Jan 15 02:29:29 2004
@@ -185,7 +185,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.49 kaffe/kaffe/kaffe/main.c:1.50
--- kaffe/kaffe/kaffe/main.c:1.49 Sat Aug 30 23:57:10 2003
+++ kaffe/kaffe/kaffe/main.c Thu Jan 15 02:29:29 2004
@@ -39,9 +39,6 @@
extern int profFlag;
#endif
-extern char* engine_name;
-extern char* engine_version;
-
#include "jni.h"
JavaVMInitArgs vmargs;
Index: kaffe/kaffe/kaffe/version.c
diff -u kaffe/kaffe/kaffe/version.c:1.7 kaffe/kaffe/kaffe/version.c:1.8
--- kaffe/kaffe/kaffe/version.c:1.7 Wed Jan 14 22:58:48 2004
+++ kaffe/kaffe/kaffe/version.c Thu Jan 15 02:29:30 2004
@@ -17,7 +17,6 @@
#include "version-info.h" /* generated at compile time */
extern char* engine_name; /* defined in the engine's library */
-extern char* engine_version; /* defined in the engine's library */
/* Must not be initialized in place, because stderr is not always a
* compile-time constant. */
@@ -40,7 +39,7 @@
fprintf(versionfd, "with ABSOLUTELY NO WARRANTY.\n\n");
fprintf(versionfd, "Engine: %s Version: %s Java Version: %s\n",
- engine_name, engine_version, JAVA_VERSION_STRING);
+ engine_name, PACKAGE_VERSION, JAVA_VERSION_STRING);
}
void
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.94 kaffe/kaffe/kaffeh/Makefile.in:1.95
--- kaffe/kaffe/kaffeh/Makefile.in:1.94 Wed Jan 14 19:41:07 2004
+++ kaffe/kaffe/kaffeh/Makefile.in Thu Jan 15 02:29:30 2004
@@ -192,7 +192,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffeh/main.c
diff -u kaffe/kaffe/kaffeh/main.c:1.12 kaffe/kaffe/kaffeh/main.c:1.13
--- kaffe/kaffe/kaffeh/main.c:1.12 Tue Mar 11 08:00:17 2003
+++ kaffe/kaffe/kaffeh/main.c Thu Jan 15 02:29:30 2004
@@ -213,7 +213,7 @@
dprintf("Kaffeh Stub Generator\n");
dprintf("Copyright (c) 1996, 1997\nTransvirtual Technologies,
Inc. All rights reserved\n");
- dprintf("Version: %s\n", KVER);
+ dprintf("Version: %s\n", PACKAGE_VERSION);
exit(0);
}
else if (strcmp(argv[i], "-base") == 0) {
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.48 kaffe/kaffe/kaffevm/Makefile.am:1.49
--- kaffe/kaffe/kaffevm/Makefile.am:1.48 Tue Dec 23 17:26:36 2003
+++ kaffe/kaffe/kaffevm/Makefile.am Thu Jan 15 02:29:30 2004
@@ -37,7 +37,7 @@
libkaffevm_la_LDFLAGS = \
$(KVMLIBFLAGS) \
-export-dynamic \
- -release $(KVER)
+ -release $(PACKAGE_VERSION)
libkaffevm_la_DEPENDENCIES = \
$(LIBLTDL) \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.128 kaffe/kaffe/kaffevm/Makefile.in:1.129
--- kaffe/kaffe/kaffevm/Makefile.in:1.128 Wed Jan 14 19:41:08 2004
+++ kaffe/kaffe/kaffevm/Makefile.in Thu Jan 15 02:29:31 2004
@@ -221,7 +221,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
@@ -365,7 +364,7 @@
libkaffevm_la_LDFLAGS = \
$(KVMLIBFLAGS) \
-export-dynamic \
- -release $(KVER)
+ -release $(PACKAGE_VERSION)
libkaffevm_la_DEPENDENCIES = \
$(LIBLTDL) \
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.77
kaffe/kaffe/kaffevm/gcj/Makefile.in:1.78
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.77 Wed Jan 14 19:41:09 2004
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Thu Jan 15 02:29:31 2004
@@ -189,7 +189,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.83
kaffe/kaffe/kaffevm/intrp/Makefile.in:1.84
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.83 Wed Jan 14 19:41:09 2004
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Thu Jan 15 02:29:32 2004
@@ -178,7 +178,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffevm/intrp/machine.c
diff -u kaffe/kaffe/kaffevm/intrp/machine.c:1.35
kaffe/kaffe/kaffevm/intrp/machine.c:1.36
--- kaffe/kaffe/kaffevm/intrp/machine.c:1.35 Wed Jan 7 17:17:01 2004
+++ kaffe/kaffe/kaffevm/intrp/machine.c Thu Jan 15 02:29:32 2004
@@ -48,7 +48,6 @@
* Define information about this engine.
*/
char* engine_name = "Interpreter";
-char* engine_version = KVER;
#define define_insn(code) break; \
case code: \
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.89
kaffe/kaffe/kaffevm/jit/Makefile.in:1.90
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.89 Wed Jan 14 19:41:09 2004
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Thu Jan 15 02:29:32 2004
@@ -183,7 +183,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffevm/jit/machine.c
diff -u kaffe/kaffe/kaffevm/jit/machine.c:1.58 kaffe/kaffe/kaffevm/jit/machine.c:1.59
--- kaffe/kaffe/kaffevm/jit/machine.c:1.58 Fri Sep 19 13:15:15 2003
+++ kaffe/kaffe/kaffevm/jit/machine.c Thu Jan 15 02:29:33 2004
@@ -51,7 +51,6 @@
* Define information about this engine.
*/
char* engine_name = "Just-in-time";
-char* engine_version = KVER;
iStaticLock translatorlock; /* lock to protect the variables below */
int stackno;
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.59
kaffe/kaffe/kaffevm/jit3/Makefile.in:1.60
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.59 Wed Jan 14 19:41:10 2004
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Thu Jan 15 02:29:33 2004
@@ -183,7 +183,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffevm/jit3/machine.c
diff -u kaffe/kaffe/kaffevm/jit3/machine.c:1.45 kaffe/kaffe/kaffevm/jit3/machine.c:1.46
--- kaffe/kaffe/kaffevm/jit3/machine.c:1.45 Fri Jan 2 22:36:23 2004
+++ kaffe/kaffe/kaffevm/jit3/machine.c Thu Jan 15 02:29:33 2004
@@ -58,7 +58,6 @@
#include "jvmpi_kaffe.h"
char* engine_name = "Just-in-time v3";
-char* engine_version = KAFFEVERSION;
/**
* top of the operand stack. localsz <= stackno < localsz+stacksz
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.85
kaffe/kaffe/kaffevm/systems/Makefile.in:1.86
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.85 Wed Jan 14 19:41:10 2004
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Thu Jan 15 02:29:33 2004
@@ -166,7 +166,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.am:1.7
kaffe/kaffe/kaffevm/systems/beos-native/Makefile.am:1.8
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.am:1.7 Fri Jan 2 17:40:11
2004
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.am Thu Jan 15 02:29:34 2004
@@ -19,6 +19,6 @@
-I$(srcdir) -I../.. -I$(srcdir)/../.. \
-I$(top_builddir)/config -I$(top_srcdir)/config \
-I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_builddir)/include
-
-DEFS = $(ENGINE_DEFS) -DKVER=\"$(KVER)\" -D_REENTRANT
+ -I$(top_builddir)/include \
+ $(ENGINE_DEFS) \
+ -D_REENTRANT
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.76
kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.77
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.76 Wed Jan 14 19:41:11
2004
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Thu Jan 15 02:29:34 2004
@@ -120,7 +120,7 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
-DEFS = $(ENGINE_DEFS) -DKVER=\"$(KVER)\" -D_REENTRANT
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
DIRSEP = @DIRSEP@
DLLTOOL = @DLLTOOL@
@@ -179,7 +179,6 @@
KAFFE_LIBS = @KAFFE_LIBS@
KLIBFLAGS = @KLIBFLAGS@
KPREFIX = @KPREFIX@
-KVER = @KVER@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
@@ -314,7 +313,9 @@
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
