dnl Process this file with autoconf to produce a configure script.
-AC_INIT(cacao, 1.1.0pre, cacao@cacaojvm.org)
+AC_INIT(cacao, 1.1.0pre2, 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])
JAVA_ARCH="alpha"
;;
-arm | armv4 | armv4tl | armv5b | armv5l | armv5tel | armv5tejl )
+arm | armv4* | armv5* | armv6* | armv7* )
ARCH_DIR="arm"
ARCH_FLAGS="-D__ARM__"
JAVA_ARCH="arm"
JAVA_ARCH="m68k"
;;
-mips | mipsel )
+mips )
ARCH_DIR="mips"
ARCH_FLAGS="-D__MIPS__"
- dnl Is this correct for mipsel?
JAVA_ARCH="mips"
;;
+mipsel )
+ ARCH_DIR="mips"
+ ARCH_FLAGS="-D__MIPS__"
+ JAVA_ARCH="mipsel"
+ ;;
+
powerpc )
ARCH_DIR="powerpc"
ARCH_FLAGS="-m32 -D__POWERPC__"
dnl Set optimization and debugging for all architectures and systems.
dnl NOTE: Setting the CFLAGS/CXXFLAGS only works before calling AC_PROG_CC/AC_PROG_CXX.
if test x"$CFLAGS" = "x"; then
- OPT_CFLAGS="-g -O0"
+ OPT_CFLAGS="-g -O2"
else
OPT_CFLAGS=$CFLAGS
fi
+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing"
if test x"$CXXFLAGS" = "x"; then
- OPT_CXXFLAGS="-g -O0"
+ OPT_CXXFLAGS="-g -O2"
else
OPT_CXXFLAGS=$CXXFLAGS
fi
+OPT_CXXFLAGS="$OPT_CXXFLAGS -fno-strict-aliasing"
dnl Check for compiler.
AC_PROG_CC
AC_CHECK_HEADERS([time.h])
AC_CHECK_HEADERS([ucontext.h])
AC_CHECK_HEADERS([unistd.h])
+AC_CHECK_HEADERS([mach/mach.h])
AC_CHECK_HEADERS([sys/ioctl.h])
+AC_CHECK_HEADERS([sys/loadavg.h])
AC_CHECK_HEADERS([sys/mman.h])
AC_CHECK_HEADERS([sys/resource.h])
AC_CHECK_HEADERS([sys/select.h])
AC_CHECK_HEADERS([sys/stat.h])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([sys/types.h])
+AC_CHECK_HEADERS([sys/utsname.h])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_CHECK_FUNCS([getenv])
AC_CHECK_FUNCS([gethostbyname])
AC_CHECK_FUNCS([gethostname])
+AC_CHECK_FUNCS([getloadavg])
AC_CHECK_FUNCS([getpagesize])
+AC_CHECK_FUNCS([getpid])
AC_CHECK_FUNCS([getrusage])
AC_CHECK_FUNCS([getsockname])
AC_CHECK_FUNCS([getsockopt])
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_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
dnl This one depends on AC_CHECK_ENABLE_ZLIB.
AC_CHECK_WITH_VM_ZIP
+AC_CHECK_WITH_HGREV
AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY
AC_CHECK_WITH_JNI_MD_H
AC_CHECK_WITH_JNI_H
+dnl The jvmti.h header is only required if JVMTI is enabled.
+if test x"${ENABLE_JVMTI}" = "xyes"; then
+ AC_CHECK_WITH_JVMTI_H
+fi
+
dnl JVM, HPI, and JMM is only required for OpenJDK.
case "${WITH_JAVA_RUNTIME_LIBRARY}" in
openjdk)
AZ_PYTHON_CSPEC
AZ_PYTHON_LSPEC
+AC_CHECK_ENABLE_GCC_PR40134
-dnl define some stuff required for --fullversion
-AC_DEFINE_UNQUOTED(VERSION_CONFIGURE_ARGS, "$ac_configure_args", [configure arguments])
-AC_DEFINE_UNQUOTED(VERSION_CC, "$CC", [CC used])
-AC_DEFINE_UNQUOTED(VERSION_CXX, "$CXX", [CXX used])
-AC_DEFINE_UNQUOTED(VERSION_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS $CC_FLAGS $CPPFLAGS", [CFLAGS used])
-AC_DEFINE_UNQUOTED(VERSION_CXXFLAGS, "$OPT_CXXFLAGS $ARCH_CXXFLAGS $CXX_FLAGS $CPPFLAGS", [CXXFLAGS used])
-
+dnl Define version numbers.
+AC_VERSION_DETAIL
+AC_VERSION_CONFIG
dnl Finally pass flags to Makefiles.
CFLAGS="$OPT_CFLAGS"
[src/mm/Makefile]
[src/mm/cacao-gc/Makefile]
[src/native/Makefile]
- [src/native/include/Makefile]
[src/native/jvmti/Makefile]
[src/native/vm/Makefile]
[src/native/vm/cldc1.1/Makefile]