projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/vm/jit/patcher-common.cpp: Conditionally restored NOP-insertion at
[cacao.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 95840e0d810a6ecff431266b12884107adaf9007..11d06e9ac7866a5a7425a46fefbcf8a4a1f37b46 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-25,6
+25,7
@@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(cacao, 1.1.0pre, cacao@cacaojvm.org)
AC_CONFIG_SRCDIR(src/cacao/cacao.cpp)
AC_INIT(cacao, 1.1.0pre, cacao@cacaojvm.org)
AC_CONFIG_SRCDIR(src/cacao/cacao.cpp)
+AC_CONFIG_AUX_DIR([.])
AC_CANONICAL_HOST
AC_PREREQ(2.59)
AM_INIT_AUTOMAKE([1.9.0 dist-bzip2 tar-ustar])
AC_CANONICAL_HOST
AC_PREREQ(2.59)
AM_INIT_AUTOMAKE([1.9.0 dist-bzip2 tar-ustar])
@@
-43,7
+44,7
@@
alpha | alphaev56 | alphapca56 )
JAVA_ARCH="alpha"
;;
JAVA_ARCH="alpha"
;;
-arm | armv4
| armv4tl | armv5b | armv5l | armv5tel | armv5tejl
)
+arm | armv4
* | armv5* | armv6*
)
ARCH_DIR="arm"
ARCH_FLAGS="-D__ARM__"
JAVA_ARCH="arm"
ARCH_DIR="arm"
ARCH_FLAGS="-D__ARM__"
JAVA_ARCH="arm"
@@
-67,13
+68,18
@@
m68k )
JAVA_ARCH="m68k"
;;
JAVA_ARCH="m68k"
;;
-mips
| mipsel
)
+mips )
ARCH_DIR="mips"
ARCH_FLAGS="-D__MIPS__"
ARCH_DIR="mips"
ARCH_FLAGS="-D__MIPS__"
- dnl Is this correct for mipsel?
JAVA_ARCH="mips"
;;
JAVA_ARCH="mips"
;;
+mipsel )
+ ARCH_DIR="mips"
+ ARCH_FLAGS="-D__MIPS__"
+ JAVA_ARCH="mipsel"
+ ;;
+
powerpc )
ARCH_DIR="powerpc"
ARCH_FLAGS="-m32 -D__POWERPC__"
powerpc )
ARCH_DIR="powerpc"
ARCH_FLAGS="-m32 -D__POWERPC__"
@@
-379,8
+385,6
@@
AC_CHECK_FUNCS([strlen])
AC_CHECK_FUNCS([strncmp])
AC_CHECK_FUNCS([strstr])
AC_CHECK_FUNCS([time])
AC_CHECK_FUNCS([strncmp])
AC_CHECK_FUNCS([strstr])
AC_CHECK_FUNCS([time])
-AC_CHECK_FUNCS([va_end])
-AC_CHECK_FUNCS([va_start])
AC_CHECK_FUNCS([write])
AC_CHECK_FUNCS([write])
@@
-439,6
+443,9
@@
AC_CHECK_ENABLE_RT_TIMING
AC_CHECK_ENABLE_CYCLE_STATS
AC_CHECK_ENABLE_JVMTI
AC_CHECK_ENABLE_THREADS
AC_CHECK_ENABLE_CYCLE_STATS
AC_CHECK_ENABLE_JVMTI
AC_CHECK_ENABLE_THREADS
+if test x"${ENABLE_THREADS}" != "xno"; then
+ AC_CHECK_USE___THREAD
+fi
AC_CHECK_ENABLE_IFCONV
AC_CHECK_ENABLE_INLINING
AC_CHECK_ENABLE_INLINING_DEBUG
AC_CHECK_ENABLE_IFCONV
AC_CHECK_ENABLE_INLINING
AC_CHECK_ENABLE_INLINING_DEBUG
@@
-584,11
+591,14
@@
dnl The check for jni_md.h must be before jni.h.
AC_CHECK_WITH_JNI_MD_H
AC_CHECK_WITH_JNI_H
AC_CHECK_WITH_JNI_MD_H
AC_CHECK_WITH_JNI_H
-dnl
HPI is only required for OpenJDK
+dnl
JVM, HPI, and JMM is only required for OpenJDK.
case "${WITH_JAVA_RUNTIME_LIBRARY}" in
openjdk)
case "${WITH_JAVA_RUNTIME_LIBRARY}" in
openjdk)
+ AC_CHECK_WITH_JVM_MD_H
+ AC_CHECK_WITH_JVM_H
AC_CHECK_WITH_HPI_MD_H
AC_CHECK_WITH_HPI_H
AC_CHECK_WITH_HPI_MD_H
AC_CHECK_WITH_HPI_H
+ AC_CHECK_WITH_JMM_H
;;
*)
;;
;;
*)
;;