PatchSet 7323
Date: 2006/07/09 16:58:25
Author: robilad
Branch: HEAD
Tag: (none)
Log:
use AC_CONFIG_LINKS instead of regen-forward for config/ headers
2006-07-09 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac: (Khost_cpu, Khost_os) Added subsitutions.
(CONFIG_MD_H, CONFIG_CALLKAFFEEXCEPTION_H, CONFIG_JIT_MD_H,
CONFIG_XPROFILE_MD_H)
Cleaned up, removed substituions and used to create links.
(HAVE_CONFIG_JIT_MD_H) Removed unused variable.
* config/Makefile.am: (USE_JIT, ENGINE_GEN_HDRS, ENABLE_XPROF,
XPROF_HDRS, GEN_HDRS, DISTCLEANFILES, nodist_noinst_HEADERS,
jit-md.h, stamp-h01, md.h, stamp-h02, xprofile-md.h, stamp-h03,
callKaffeException.h, stamp-h04, dist-hook) Removed no longer
useful targets and variables.
* kaffe/jvmpi/Makefile.am,
kaffe/kaffe/Makefile.am,
kaffe/kaffeh/Makefile.am,
kaffe/kaffevm/Makefile.am,
kaffe/kaffevm/boehm-gc/Makefile.am,
kaffe/kaffevm/gcj/Makefile.am,
kaffe/kaffevm/intrp/Makefile.am,
kaffe/kaffevm/jit/Makefile.am,
kaffe/kaffevm/jit3/Makefile.am,
kaffe/kaffevm/jni/Makefile.am,
kaffe/kaffevm/kaffe-gc/Makefile.am,
kaffe/kaffevm/systems/beos-native/Makefile.am,
kaffe/kaffevm/systems/drops-l4threads/Makefile.am,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.am,
kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
kaffe/kaffevm/verifier/Makefile.am,
kaffe/xprof/Makefile.am,
libraries/clib/awt/X/Makefile.am,
libraries/clib/management/Makefile.am,
libraries/clib/native/Makefile.am,
libraries/clib/net/Makefile.am,
libraries/clib/security/Makefile.am,
test/internal/Makefile.am (AM_CPPFLAGS): Added
config/ and config//
to include path.
Members:
ChangeLog:1.4826->1.4827
Makefile.in:1.253->1.254
configure:1.545->1.546
configure.ac:1.223->1.224
config/Makefile.am:1.69->1.70
config/Makefile.in:1.219->1.220
external/Makefile.in:1.11->1.12
external/gcc/Makefile.in:1.12->1.13
external/gcc/zlib/Makefile.in:1.11->1.12
include/Makefile.in:1.278->1.279
kaffe/Makefile.in:1.174->1.175
kaffe/jvmpi/Makefile.am:1.10->1.11
kaffe/jvmpi/Makefile.in:1.98->1.99
kaffe/kaffe/Makefile.am:1.34->1.35
kaffe/kaffe/Makefile.in:1.196->1.197
kaffe/kaffeh/Makefile.am:1.24->1.25
kaffe/kaffeh/Makefile.in:1.177->1.178
kaffe/kaffevm/Makefile.am:1.81->1.82
kaffe/kaffevm/Makefile.in:1.231->1.232
kaffe/kaffevm/boehm-gc/Makefile.am:1.9->1.10
kaffe/kaffevm/boehm-gc/Makefile.in:1.61->1.62
kaffe/kaffevm/gcj/Makefile.am:1.9->1.10
kaffe/kaffevm/gcj/Makefile.in:1.154->1.155
kaffe/kaffevm/intrp/Makefile.am:1.13->1.14
kaffe/kaffevm/intrp/Makefile.in:1.163->1.164
kaffe/kaffevm/jit/Makefile.am:1.23->1.24
kaffe/kaffevm/jit/Makefile.in:1.173->1.174
kaffe/kaffevm/jit3/Makefile.am:1.17->1.18
kaffe/kaffevm/jit3/Makefile.in:1.143->1.144
kaffe/kaffevm/jni/Makefile.am:1.8->1.9
kaffe/kaffevm/jni/Makefile.in:1.67->1.68
kaffe/kaffevm/kaffe-gc/Makefile.am:1.7->1.8
kaffe/kaffevm/kaffe-gc/Makefile.in:1.60->1.61
kaffe/kaffevm/systems/Makefile.in:1.163->1.164
kaffe/kaffevm/systems/beos-native/Makefile.am:1.10->1.11
kaffe/kaffevm/systems/beos-native/Makefile.in:1.154->1.155
kaffe/kaffevm/systems/drops-l4threads/Makefile.am:1.2->1.3
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.17->1.18
kaffe/kaffevm/systems/oskit-pthreads/Makefile.am:1.11->1.12
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.160->1.161
kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.15->1.16
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.164->1.165
kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.15->1.16
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.139->1.140
kaffe/kaffevm/verifier/Makefile.am:1.6->1.7
kaffe/kaffevm/verifier/Makefile.in:1.66->1.67
kaffe/man/Makefile.in:1.161->1.162
kaffe/scripts/Makefile.in:1.202->1.203
kaffe/scripts/bat/Makefile.in:1.153->1.154
kaffe/scripts/compat/Makefile.in:1.180->1.181
kaffe/xprof/Makefile.am:1.14->1.15
kaffe/xprof/Makefile.in:1.129->1.130
libraries/Makefile.in:1.157->1.158
libraries/clib/Makefile.in:1.174->1.175
libraries/clib/awt/Makefile.in:1.172->1.173
libraries/clib/awt/X/Makefile.am:1.19->1.20
libraries/clib/awt/X/Makefile.in:1.165->1.166
libraries/clib/awt/nano-X/Makefile.in:1.38->1.39
libraries/clib/awt/qt/Makefile.in:1.120->1.121
libraries/clib/io/Makefile.in:1.170->1.171
libraries/clib/management/Makefile.am:1.16->1.17
libraries/clib/management/Makefile.in:1.174->1.175
libraries/clib/math/Makefile.in:1.169->1.170
libraries/clib/native/Makefile.am:1.56->1.57
libraries/clib/native/Makefile.in:1.219->1.220
libraries/clib/net/Makefile.am:1.22->1.23
libraries/clib/net/Makefile.in:1.180->1.181
libraries/clib/nio/Makefile.in:1.105->1.106
libraries/clib/security/Makefile.am:1.18->1.19
libraries/clib/security/Makefile.in:1.140->1.141
libraries/clib/sound/Makefile.in:1.66->1.67
libraries/clib/sound/alsa/Makefile.in:1.67->1.68
libraries/clib/sound/common/Makefile.in:1.66->1.67
libraries/clib/sound/esd/Makefile.in:1.67->1.68
libraries/clib/target/Makefile.in:1.26->1.27
libraries/clib/target/Linux/Makefile.in:1.26->1.27
libraries/clib/target/generic/Makefile.in:1.26->1.27
libraries/clib/zip/Makefile.in:1.172->1.173
libraries/extensions/Makefile.in:1.149->1.150
libraries/extensions/comm/Makefile.in:1.143->1.144
libraries/extensions/comm/javalib/Makefile.in:1.144->1.145
libraries/extensions/microsoft/Makefile.in:1.135->1.136
libraries/extensions/microsoft/clib/Makefile.in:1.139->1.140
libraries/extensions/microsoft/javalib/Makefile.in:1.137->1.138
libraries/extensions/pjava/Makefile.in:1.143->1.144
libraries/extensions/pjava/javalib/Makefile.in:1.144->1.145
libraries/extensions/servlet/Makefile.in:1.143->1.144
libraries/extensions/servlet/javalib/Makefile.in:1.144->1.145
libraries/javalib/Makefile.in:1.542->1.543
libraries/javalib/awt-implementations/Makefile.in:1.51->1.52
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.65->1.66
libraries/javalib/gmp-math/Makefile.in:1.58->1.59
replace/Makefile.in:1.116->1.117
test/Makefile.in:1.166->1.167
test/internal/Makefile.am:1.27->1.28
test/internal/Makefile.in:1.138->1.139
test/jni/Makefile.in:1.69->1.70
test/regression/Makefile.in:1.242->1.243
test/regression/compile_time/Makefile.in:1.94->1.95
test/regression/compiler/Makefile.in:1.78->1.79
test/regression/run_time/Makefile.in:1.93->1.94
tools/Makefile.in:1.68->1.69
tools/gjdoc/Makefile.in:1.67->1.68
tools/gjdoc/javalib/Makefile.in:1.83->1.84
tools/javatools/Makefile.in:1.21->1.22
tools/javatools/javalib/Makefile.in:1.23->1.24
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4826 kaffe/ChangeLog:1.4827
--- kaffe/ChangeLog:1.4826 Sun Jul 9 10:00:20 2006
+++ kaffe/ChangeLog Sun Jul 9 16:58:25 2006
@@ -1,5 +1,46 @@
2006-07-09 Dalibor Topic <[EMAIL PROTECTED]>
+ * configure.ac: (Khost_cpu, Khost_os) Added subsitutions.
+ (CONFIG_MD_H, CONFIG_CALLKAFFEEXCEPTION_H, CONFIG_JIT_MD_H,
+ CONFIG_XPROFILE_MD_H)
+ Cleaned up, removed substituions and used to create links.
+ (HAVE_CONFIG_JIT_MD_H) Removed unused variable.
+
+ * config/Makefile.am: (USE_JIT, ENGINE_GEN_HDRS, ENABLE_XPROF,
+ XPROF_HDRS, GEN_HDRS, DISTCLEANFILES, nodist_noinst_HEADERS,
+ jit-md.h, stamp-h01, md.h, stamp-h02, xprofile-md.h, stamp-h03,
+ callKaffeException.h, stamp-h04, dist-hook) Removed no longer
+ useful targets and variables.
+
+ * kaffe/jvmpi/Makefile.am,
+ kaffe/kaffe/Makefile.am,
+ kaffe/kaffeh/Makefile.am,
+ kaffe/kaffevm/Makefile.am,
+ kaffe/kaffevm/boehm-gc/Makefile.am,
+ kaffe/kaffevm/gcj/Makefile.am,
+ kaffe/kaffevm/intrp/Makefile.am,
+ kaffe/kaffevm/jit/Makefile.am,
+ kaffe/kaffevm/jit3/Makefile.am,
+ kaffe/kaffevm/jni/Makefile.am,
+ kaffe/kaffevm/kaffe-gc/Makefile.am,
+ kaffe/kaffevm/systems/beos-native/Makefile.am,
+ kaffe/kaffevm/systems/drops-l4threads/Makefile.am,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.am,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
+ kaffe/kaffevm/verifier/Makefile.am,
+ kaffe/xprof/Makefile.am,
+ libraries/clib/awt/X/Makefile.am,
+ libraries/clib/management/Makefile.am,
+ libraries/clib/native/Makefile.am,
+ libraries/clib/net/Makefile.am,
+ libraries/clib/security/Makefile.am,
+ test/internal/Makefile.am (AM_CPPFLAGS): Added
+ config/$Khost_cpu and config/$Khost_cpu/$Khost_os
+ to include path.
+
+2006-07-09 Dalibor Topic <[EMAIL PROTECTED]>
+
* (nodist_GEN_SRCS, $(nodist_GEN_SRCS), nodist_jitBasic_SOURCES)
Removed, since functions from version.c are not used anywhere in
the test code, so it doesn't need to be forward generated, compiled
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.253 kaffe/Makefile.in:1.254
--- kaffe/Makefile.in:1.253 Sat Jul 8 14:43:35 2006
+++ kaffe/Makefile.in Sun Jul 9 16:58:31 2006
@@ -160,10 +160,6 @@
COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@
COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@
-CONFIG_CALLKAFFEEXCEPTION_H = @CONFIG_CALLKAFFEEXCEPTION_H@
-CONFIG_JIT_MD_H = @CONFIG_JIT_MD_H@
-CONFIG_MD_H = @CONFIG_MD_H@
-CONFIG_XPROFILE_MD_H = @CONFIG_XPROFILE_MD_H@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@
@@ -208,7 +204,6 @@
GMSGFMT = @GMSGFMT@
HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
-HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@
HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
@@ -240,6 +235,8 @@
KPREFIX = @KPREFIX@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
+Khost_cpu = @Khost_cpu@
+Khost_os = @Khost_os@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
LIBICONV = @LIBICONV@
Index: kaffe/configure
diff -u kaffe/configure:1.545 kaffe/configure:1.546
--- kaffe/configure:1.545 Sat Jul 8 14:43:35 2006
+++ kaffe/configure Sun Jul 9 16:58:31 2006
@@ -493,7 +493,7 @@
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
ac_subdirs_all="$ac_subdirs_all external/gcc/fastjar"
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
KAFFE_CFLAGS 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 LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE
REPLACE_GETOPT_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 CREATE_XMLJ_LIBRARY_TRUE
CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE
CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE
CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE
CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine
THREAD_SYSTEM KPREFIX KAFFE_ARCHOS MKTEMP JASMIN HAVE_JAVAC_TRUE
HAVE_JAVAC_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 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 COND_GJDOC_TRUE
COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE
DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS
COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE
COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS
BINRELOC_LIBS KAFFEH MAKE_KAFFEH kaffe_builddir FASTJAR 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
KAFFE_CFLAGS 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 Khost_cpu Khost_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 LIBOBJS GETOPT_H
REPLACE_GETOPT_TRUE REPLACE_GETOPT_FALSE REGEN_FORWARD KAFFEVM_MD_C
KAFFEVM_JIT_DEF KAFFEVM_ICODE_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 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
CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE
CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE
CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE
CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine
THREAD_SYSTEM KPREFIX KAFFE_ARCHOS MKTEMP JASMIN HAVE_JAVAC_TRUE
HAVE_JAVAC_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 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 COND_GJDOC_TRUE
COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE
DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS
COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE
COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS
BINRELOC_LIBS KAFFEH MAKE_KAFFEH kaffe_builddir FASTJAR 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.
@@ -5580,7 +5580,9 @@
known=no
Khost_cpu=$host_cpu
+
Khost_os=$host_os
+
if test -f $srcdir/config/config.alias ; then
. $srcdir/config/config.alias
fi
@@ -6190,7 +6192,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6193 "configure"' > conftest.$ac_ext
+ echo '#line 6195 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7567,7 +7569,7 @@
# Provide some information about the compiler.
-echo "$as_me:7570:" \
+echo "$as_me:7572:" \
"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
@@ -8634,11 +8636,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8637: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8639: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8641: \$? = $ac_status" >&5
+ echo "$as_me:8643: \$? = $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.
@@ -8902,11 +8904,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8905: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8907: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8909: \$? = $ac_status" >&5
+ echo "$as_me:8911: \$? = $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.
@@ -9006,11 +9008,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9009: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9011: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9013: \$? = $ac_status" >&5
+ echo "$as_me:9015: \$? = $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
@@ -11351,7 +11353,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11354 "configure"
+#line 11356 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11451,7 +11453,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11454 "configure"
+#line 11456 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13795,11 +13797,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13798: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13800: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13802: \$? = $ac_status" >&5
+ echo "$as_me:13804: \$? = $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.
@@ -13899,11 +13901,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13902: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13904: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13906: \$? = $ac_status" >&5
+ echo "$as_me:13908: \$? = $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
@@ -15469,11 +15471,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15472: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15474: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15476: \$? = $ac_status" >&5
+ echo "$as_me:15478: \$? = $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.
@@ -15573,11 +15575,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15576: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15578: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15580: \$? = $ac_status" >&5
+ echo "$as_me:15582: \$? = $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
@@ -17780,11 +17782,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17783: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17785: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17787: \$? = $ac_status" >&5
+ echo "$as_me:17789: \$? = $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.
@@ -18048,11 +18050,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18051: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18053: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18055: \$? = $ac_status" >&5
+ echo "$as_me:18057: \$? = $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.
@@ -18152,11 +18154,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18155: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18159: \$? = $ac_status" >&5
+ echo "$as_me:18161: \$? = $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
@@ -23448,15 +23450,13 @@
REGEN_FORWARD="\$(top_srcdir)/config/regen-forward"
-CONFIG_MD_H="\$(srcdir)/$Khost_cpu/$Khost_os/md.h"
-CONFIG_CALLKAFFEEXCEPTION_H="\$(top_srcdir)/config/$Khost_cpu/callKaffeException.h"
+CONFIG_MD_H="config/$Khost_cpu/$Khost_os/md.h"
+CONFIG_CALLKAFFEEXCEPTION_H="config/$Khost_cpu/callKaffeException.h"
KAFFEVM_MD_C="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/md.c"
-
-
if test -f $srcdir/config/$Khost_cpu/$Khost_os/Make.frag ; then
cpu_os_frag=$srcdir/config/$Khost_cpu/$Khost_os/Make.frag
else
@@ -23540,19 +23540,13 @@
fi
if test x"$with_engine" != x"intrp" ; then
- HAVE_CONFIG_JIT_MD_H=1
-
CONFIG_JIT_MD_H="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/$with_engine-md.h"
-
+ CONFIG_JIT_MD_H="config/$Khost_cpu/$Khost_os/$with_engine-md.h"
KAFFEVM_JIT_DEF="\$(top_srcdir)/config/$Khost_cpu/$with_engine-$Khost_cpu.def"
KAFFEVM_ICODE_H="\$(top_srcdir)/config/$Khost_cpu/$with_engine-icode.h"
-else
- HAVE_CONFIG_JIT_MD_H=0
fi
-
-
echo "$as_me:$LINENO: checking execution engine" >&5
echo $ECHO_N "checking execution engine... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $with_engine" >&5
@@ -23702,8 +23696,7 @@
if test x"$xprofiling" = x"yes"; then
if test -f "$srcdir/config/$Khost_cpu/$Khost_os/xprofile-md.h"; then
-
CONFIG_XPROFILE_MD_H="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/xprofile-md.h"
-
+ CONFIG_XPROFILE_MD_H="config/$Khost_cpu/$Khost_os/xprofile-md.h"
else
{ { echo "$as_me:$LINENO: error: Profiling not supported in
$Khost_cpu-$Khost_os" >&5
echo "$as_me: error: Profiling not supported in $Khost_cpu-$Khost_os" >&2;}
@@ -51217,6 +51210,21 @@
ac_config_files="$ac_config_files test/jni/Makefile"
+if test x"$with_engine" != x"intrp" ; then
+ ac_config_links="$ac_config_links config/jit-md.h:$CONFIG_JIT_MD_H"
+
+fi
+
+if test x"$xprofiling" = x"yes"; then
+ ac_config_links="$ac_config_links
config/xprofile-md.h:$CONFIG_XPROFILE_MD_H"
+
+fi
+
+ ac_config_links="$ac_config_links config/md.h:$CONFIG_MD_H"
+
+ ac_config_links="$ac_config_links
config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H"
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -51893,6 +51901,9 @@
Configuration headers:
$config_headers
+Configuration links:
+$config_links
+
Configuration commands:
$config_commands
@@ -52139,6 +52150,10 @@
"test/regression/run_time/Makefile" ) CONFIG_FILES="$CONFIG_FILES
test/regression/run_time/Makefile" ;;
"test/regression/run_time/CompileScript" ) CONFIG_FILES="$CONFIG_FILES
test/regression/run_time/CompileScript" ;;
"test/jni/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/jni/Makefile" ;;
+ "config/jit-md.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/jit-md.h:$CONFIG_JIT_MD_H" ;;
+ "config/xprofile-md.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/xprofile-md.h:$CONFIG_XPROFILE_MD_H" ;;
+ "config/md.h" ) CONFIG_LINKS="$CONFIG_LINKS config/md.h:$CONFIG_MD_H" ;;
+ "config/callKaffeException.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"$ac_stdint_h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS $ac_stdint_h" ;;
@@ -52156,6 +52171,7 @@
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
@@ -52287,6 +52303,8 @@
s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
+s,@Khost_cpu@,$Khost_cpu,;t t
+s,@Khost_os@,$Khost_os,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
@@ -52328,13 +52346,9 @@
s,@REPLACE_GETOPT_TRUE@,$REPLACE_GETOPT_TRUE,;t t
s,@REPLACE_GETOPT_FALSE@,$REPLACE_GETOPT_FALSE,;t t
s,@REGEN_FORWARD@,$REGEN_FORWARD,;t t
-s,@CONFIG_MD_H@,$CONFIG_MD_H,;t t
-s,@CONFIG_CALLKAFFEEXCEPTION_H@,$CONFIG_CALLKAFFEEXCEPTION_H,;t t
s,@KAFFEVM_MD_C@,$KAFFEVM_MD_C,;t t
-s,@CONFIG_JIT_MD_H@,$CONFIG_JIT_MD_H,;t t
s,@KAFFEVM_JIT_DEF@,$KAFFEVM_JIT_DEF,;t t
s,@KAFFEVM_ICODE_H@,$KAFFEVM_ICODE_H,;t t
-s,@HAVE_CONFIG_JIT_MD_H@,$HAVE_CONFIG_JIT_MD_H,;t t
s,@USE_JIT_TRUE@,$USE_JIT_TRUE,;t t
s,@USE_JIT_FALSE@,$USE_JIT_FALSE,;t t
s,@ENGINE_NAME@,$ENGINE_NAME,;t t
@@ -52345,7 +52359,6 @@
s,@ENABLE_JVMPI_FALSE@,$ENABLE_JVMPI_FALSE,;t t
s,@ENABLE_XPROF_TRUE@,$ENABLE_XPROF_TRUE,;t t
s,@ENABLE_XPROF_FALSE@,$ENABLE_XPROF_FALSE,;t t
-s,@CONFIG_XPROFILE_MD_H@,$CONFIG_XPROFILE_MD_H,;t t
s,@JAVAC_FLAGS@,$JAVAC_FLAGS,;t t
s,@NEED_LIBXPROF_TRUE@,$NEED_LIBXPROF_TRUE,;t t
s,@NEED_LIBXPROF_FALSE@,$NEED_LIBXPROF_FALSE,;t t
@@ -52965,6 +52978,144 @@
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`/stamp-h$_am_stamp_count
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_LINKS section.
+#
+
+for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+ { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
+echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
+
+ if test ! -r $srcdir/$ac_source; then
+ { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
+echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ rm -f $ac_dest
+
+ # Make relative symlinks.
+ ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dest_dir"
+ else
+ as_dir="$ac_dest_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory
\"$ac_dest_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
+ ac_builddir=.
+
+if test "$ac_dest_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dest_dir";;
+*)
+ case "$ac_dest_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+
+ case $srcdir in
+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
+ *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
+ esac
+
+ # Try a symlink, then a hard link, then a copy.
+ ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+ ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
+ cp -p $srcdir/$ac_source $ac_dest ||
+ { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to
$ac_dest" >&5
+echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
+ { (exit 1); exit 1; }; }
done
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.223 kaffe/configure.ac:1.224
--- kaffe/configure.ac:1.223 Sat Jul 8 14:43:44 2006
+++ kaffe/configure.ac Sun Jul 9 16:58:38 2006
@@ -279,7 +279,9 @@
known=no
Khost_cpu=$host_cpu
+AC_SUBST([Khost_cpu])
Khost_os=$host_os
+AC_SUBST([Khost_os])
if test -f $srcdir/config/config.alias ; then
. $srcdir/config/config.alias
fi
@@ -387,11 +389,9 @@
dnl One-liners with #include directives will be created in the Makefiles
dnl -------------------------------------------------------------------------
-CONFIG_MD_H="\$(srcdir)/$Khost_cpu/$Khost_os/md.h"
-CONFIG_CALLKAFFEEXCEPTION_H="\$(top_srcdir)/config/$Khost_cpu/callKaffeException.h"
+CONFIG_MD_H="config/$Khost_cpu/$Khost_os/md.h"
+CONFIG_CALLKAFFEEXCEPTION_H="config/$Khost_cpu/callKaffeException.h"
KAFFEVM_MD_C="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/md.c"
-AC_SUBST(CONFIG_MD_H)
-AC_SUBST(CONFIG_CALLKAFFEEXCEPTION_H)
AC_SUBST(KAFFEVM_MD_C)
dnl =========================================================================
@@ -480,19 +480,13 @@
fi
if test x"$with_engine" != x"intrp" ; then
- HAVE_CONFIG_JIT_MD_H=1
-
CONFIG_JIT_MD_H="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/$with_engine-md.h"
- AC_SUBST(CONFIG_JIT_MD_H)
+ CONFIG_JIT_MD_H="config/$Khost_cpu/$Khost_os/$with_engine-md.h"
KAFFEVM_JIT_DEF="\$(top_srcdir)/config/$Khost_cpu/$with_engine-$Khost_cpu.def"
AC_SUBST(KAFFEVM_JIT_DEF)
KAFFEVM_ICODE_H="\$(top_srcdir)/config/$Khost_cpu/$with_engine-icode.h"
AC_SUBST(KAFFEVM_ICODE_H)
-else
- HAVE_CONFIG_JIT_MD_H=0
fi
-AC_SUBST(HAVE_CONFIG_JIT_MD_H)
-
AC_MSG_CHECKING(execution engine)
AC_MSG_RESULT($with_engine)
AM_CONDITIONAL(USE_JIT, test x"$with_engine" != x"intrp")
@@ -598,8 +592,7 @@
if test x"$xprofiling" = x"yes"; then
if test -f "$srcdir/config/$Khost_cpu/$Khost_os/xprofile-md.h"; then
-
CONFIG_XPROFILE_MD_H="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/xprofile-md.h"
- AC_SUBST(CONFIG_XPROFILE_MD_H)
+ CONFIG_XPROFILE_MD_H="config/$Khost_cpu/$Khost_os/xprofile-md.h"
else
AC_MSG_ERROR(Profiling not supported in $Khost_cpu-$Khost_os)
fi
@@ -2618,5 +2611,16 @@
AC_CONFIG_FILES([test/regression/run_time/Makefile])
AC_CONFIG_FILES([test/regression/run_time/CompileScript])
AC_CONFIG_FILES([test/jni/Makefile])
+
+if test x"$with_engine" != x"intrp" ; then
+ AC_CONFIG_LINKS([config/jit-md.h:$CONFIG_JIT_MD_H])
+fi
+
+if test x"$xprofiling" = x"yes"; then
+ AC_CONFIG_LINKS([config/xprofile-md.h:$CONFIG_XPROFILE_MD_H])
+fi
+
+AC_CONFIG_LINKS([config/md.h:$CONFIG_MD_H])
+AC_CONFIG_LINKS([config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H])
AC_OUTPUT
Index: kaffe/config/Makefile.am
diff -u kaffe/config/Makefile.am:1.69 kaffe/config/Makefile.am:1.70
--- kaffe/config/Makefile.am:1.69 Sun Mar 26 22:53:12 2006
+++ kaffe/config/Makefile.am Sun Jul 9 16:58:40 2006
@@ -9,34 +9,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-if USE_JIT
-ENGINE_GEN_HDRS = jit-md.h
-else
-ENGINE_GEN_HDRS =
-endif
-
-if ENABLE_XPROF
-XPROF_HDRS = xprofile-md.h
-else
-XPROF_HDRS =
-endif
-
-GEN_HDRS = \
- md.h \
- callKaffeException.h \
- $(XPROF_HDRS) \
- $(ENGINE_GEN_HDRS)
-
-DISTCLEANFILES = \
- $(GEN_HDRS) \
- stamp-h01 \
- stamp-h02 \
- stamp-h03 \
- stamp-h04
-
-nodist_noinst_HEADERS = \
- $(GEN_HDRS)
-
noinst_HEADERS = \
config-hacks.h \
config-io.h \
@@ -422,32 +394,3 @@
sh/sysdepCallMethod.h \
sh/threads.h \
sh/trampolines.S
-
-jit-md.h: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_JIT_MD_H) jit-md.h $@
-
-md.h: stamp-h02
- @if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
- else :; fi
-stamp-h02: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_MD_H) md.h $@
-
-xprofile-md.h: stamp-h03
- @if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
- else :; fi
-stamp-h03: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_XPROFILE_MD_H) xprofile-md.h $@
-
-callKaffeException.h: stamp-h04
- @if test ! -f $@; then rm -f stamp-h04; $(MAKE) stamp-h04; \
- else :; fi
-stamp-h04: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_CALLKAFFEEXCEPTION_H)
callKaffeException.h $@
-
-dist-hook:
- @for file in $(DISTCLEANFILES); do \
- rm -f $(distdir)/$$file; \
- done
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.219 kaffe/config/Makefile.in:1.220
--- kaffe/config/Makefile.in:1.219 Sat Jul 8 14:43:45 2006
+++ kaffe/config/Makefile.in Sun Jul 9 16:58:40 2006
@@ -75,10 +75,10 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = jit-md.h xprofile-md.h md.h callKaffeException.h
SOURCES =
DIST_SOURCES =
-HEADERS = $(nodist_noinst_HEADERS) $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -134,10 +134,6 @@
COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@
COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@
-CONFIG_CALLKAFFEEXCEPTION_H = @CONFIG_CALLKAFFEEXCEPTION_H@
-CONFIG_JIT_MD_H = @CONFIG_JIT_MD_H@
-CONFIG_MD_H = @CONFIG_MD_H@
-CONFIG_XPROFILE_MD_H = @CONFIG_XPROFILE_MD_H@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@
@@ -182,7 +178,6 @@
GMSGFMT = @GMSGFMT@
HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
-HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@
HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
@@ -214,6 +209,8 @@
KPREFIX = @KPREFIX@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
+Khost_cpu = @Khost_cpu@
+Khost_os = @Khost_os@
LDFLAGS = @LDFLAGS@
LIBADD_GMP = @LIBADD_GMP@
LIBICONV = @LIBICONV@
@@ -357,26 +354,6 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
[EMAIL PROTECTED]@ENGINE_GEN_HDRS =
[EMAIL PROTECTED]@ENGINE_GEN_HDRS = jit-md.h
[EMAIL PROTECTED]@XPROF_HDRS =
[EMAIL PROTECTED]@XPROF_HDRS = xprofile-md.h
-GEN_HDRS = \
- md.h \
- callKaffeException.h \
- $(XPROF_HDRS) \
- $(ENGINE_GEN_HDRS)
-
-DISTCLEANFILES = \
- $(GEN_HDRS) \
- stamp-h01 \
- stamp-h02 \
- stamp-h03 \
- stamp-h04
-
-nodist_noinst_HEADERS = \
- $(GEN_HDRS)
-
noinst_HEADERS = \
config-hacks.h \
config-io.h \
@@ -900,9 +877,6 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-am
all-am: Makefile $(HEADERS) config.h
@@ -927,7 +901,6 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -980,45 +953,16 @@
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool ctags dist-hook distclean distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ clean-libtool ctags distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-info-am
-
-jit-md.h: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_JIT_MD_H) jit-md.h $@
-
-md.h: stamp-h02
- @if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
- else :; fi
-stamp-h02: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_MD_H) md.h $@
-
-xprofile-md.h: stamp-h03
- @if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
- else :; fi
-stamp-h03: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_XPROFILE_MD_H) xprofile-md.h $@
-
-callKaffeException.h: stamp-h04
- @if test ! -f $@; then rm -f stamp-h04; $(MAKE) stamp-h04; \
- else :; fi
-stamp-h04: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(CONFIG_CALLKAFFEEXCEPTION_H)
callKaffeException.h $@
-
-dist-hook:
- @for file in $(DISTCLEANFILES); do \
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
