dnl configure.ac
dnl
-dnl Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-dnl C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-dnl E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-dnl J. Wenninger, Institut f. Computersprachen - TU Wien
+dnl Copyright (C) 1996-2005, 2006, 2007, 2008
+dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
dnl
dnl This file is part of CACAO.
dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(cacao, 0.98+svn, cacao@cacaojvm.org)
+AC_INIT(cacao, 0.99rc5, cacao@cacaojvm.org)
AC_CONFIG_SRCDIR(src/cacao/cacao.c)
AC_CANONICAL_HOST
AC_PREREQ(2.59)
dnl set interpreter flags
AC_SUBST(INTRP_CFLAGS)
-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_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS", [CFLAGS used])
-
-
dnl define and substitute some architecture specific variables
AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [architecture directory])
AC_DEFINE_UNQUOTED([JAVA_ARCH], "${JAVA_ARCH}", [Java architecture name])
AC_CHECK_HEADERS([fcntl.h])
AC_CHECK_HEADERS([libgen.h])
AC_CHECK_HEADERS([netdb.h])
+AC_CHECK_HEADERS([stdint.h])
+AC_CHECK_HEADERS([stdio.h])
AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([string.h])
AC_CHECK_HEADERS([time.h])
AC_CHECK_HEADERS([sys/types.h])
dnl this is for fdlibm
-AC_CHECK_HEADERS([stdint.h])
AC_CHECK_HEADERS([inttypes.h])
AC_CHECK_HEADERS([sys/config.h])
AC_CHECK_HEADERS([sys/types.h])
AC_FUNC_MMAP
dnl keep them alpha-sorted!
+AC_CHECK_FUNCS([abort])
AC_CHECK_FUNCS([accept])
AC_CHECK_FUNCS([access])
AC_CHECK_FUNCS([atoi])
AC_CHECK_FUNCS([confstr])
AC_CHECK_FUNCS([connect])
AC_CHECK_FUNCS([dirname])
+AC_CHECK_FUNCS([fclose])
AC_CHECK_FUNCS([fflush])
AC_CHECK_FUNCS([fopen])
AC_CHECK_FUNCS([fprintf])
+AC_CHECK_FUNCS([fread])
AC_CHECK_FUNCS([free])
AC_CHECK_FUNCS([fstat])
AC_CHECK_FUNCS([fsync])
AC_CHECK_FUNCS([mmap])
AC_CHECK_FUNCS([mprotect])
AC_CHECK_FUNCS([open])
+AC_CHECK_FUNCS([read])
AC_CHECK_FUNCS([readlink])
AC_CHECK_FUNCS([realloc])
AC_CHECK_FUNCS([recv])
AC_CHECK_FUNCS([setsockopt])
AC_CHECK_FUNCS([shutdown])
AC_CHECK_FUNCS([socket])
+AC_CHECK_FUNCS([stat])
+AC_CHECK_FUNCS([strcat])
AC_CHECK_FUNCS([strchr])
+AC_CHECK_FUNCS([strcpy])
AC_CHECK_FUNCS([strdup])
AC_CHECK_FUNCS([strerror])
+AC_CHECK_FUNCS([strlen])
AC_CHECK_FUNCS([strncmp])
AC_CHECK_FUNCS([strstr])
AC_CHECK_FUNCS([time])
+AC_CHECK_FUNCS([write])
dnl Checks for libraries.
dnl check for verifier
AC_MSG_CHECKING(whether classfile verification should be enabled)
AC_ARG_ENABLE([verifier],
- [AS_HELP_STRING(--disable-verifier,disable classfile verification [[default=yes]])],
+ [AS_HELP_STRING(--disable-verifier,disable classfile verification [[default=enabled]])],
[case "${enableval}" in
no) ENABLE_VERIFIER=no;;
*) ENABLE_VERIFIER=yes;;
dnl check if if-conversion should be supported
AC_MSG_CHECKING(whether if-conversion should be supported)
AC_ARG_ENABLE([ifconv],
- [AS_HELP_STRING(--disable-ifconv,disable if-conversion [[default=yes]])],
+ [AS_HELP_STRING(--disable-ifconv,disable if-conversion [[default=enabled]])],
[case "${enableval}" in
no) ENABLE_IFCONV=no;;
*) ENABLE_IFCONV=yes;;
dnl check if linear scan register allocator(lsra) with SSA should be used
AC_MSG_CHECKING(whether lsra with ssa should be supported)
AC_ARG_ENABLE([ssa],
- [AS_HELP_STRING(--disable-ssa,disable ssa [[default=no]])],
+ [AS_HELP_STRING(--disable-ssa,disable ssa [[default=disabled]])],
[case "${enableval}" in
no) ENABLE_SSA=no;;
*) ENABLE_SSA=yes;;
[ENABLE_SSA=no])
AC_MSG_RESULT(${ENABLE_SSA})
AM_CONDITIONAL([ENABLE_SSA], test x"${ENABLE_SSA}" = "xyes")
+AM_CONDITIONAL([ENABLE_ESCAPE], test x"${ENABLE_SSA}" = "xyes")
if test x"${ENABLE_SSA}" = "xyes"; then
AC_DEFINE([ENABLE_SSA], 1, [enable lsra with ssa])
+ AC_DEFINE([ENABLE_ESCAPE], 1, [enable escape analysis with ssa])
ENABLE_LSRA="no"
fi
AC_DEFINE([ENABLE_LSRA], 1, [enable lsra])
fi
-
dnl check if profiling should be supported
AC_MSG_CHECKING(whether profiling should be supported)
AC_ARG_ENABLE([profiling],
AC_CHECK_WITH_CACAOH
-AC_CHECK_WITH_CLASSPATH
-AC_CHECK_WITH_CLASSPATH_PREFIX
-AC_CHECK_WITH_CLASSPATH_CLASSES
-AC_CHECK_WITH_CLASSPATH_LIBDIR
-AC_CHECK_WITH_CLASSPATH_INCLUDEDIR
-AC_CHECK_WITH_JRE_LAYOUT
+AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY
+
+dnl Now we check for jre-layout so we can skip some checks that are
+dnl not required.
+AC_CHECK_ENABLE_JRE_LAYOUT
+
+AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
+if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+fi
+
+dnl The check for jni_md.h must be before jni.h.
+AC_CHECK_WITH_JNI_MD_H
+AC_CHECK_WITH_JNI_H
+
+dnl HPI is only required for OpenJDK
+case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ openjdk)
+ AC_CHECK_WITH_HPI_MD_H
+ AC_CHECK_WITH_HPI_H
+ ;;
+ *)
+ ;;
+esac
dnl check for some programs we need
-case "${WITH_CLASSPATH}" in
- cldc1.1 | gnu)
+case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ cldc1.1 | gnuclasspath)
AC_PROG_JAVAC
AC_PROG_JAR
;;
- sun)
+ openjdk)
;;
*)
- AC_MSG_ERROR(unknown classpath configuration ${WITH_CLASSPATH})
+ AC_MSG_ERROR(unknown classpath configuration ${WITH_JAVA_RUNTIME_LIBRARY})
;;
esac
]
)
+dnl python
+
+AZ_PYTHON_DEFAULT
+AZ_PYTHON_ENABLE
+AZ_PYTHON_WITH
+AZ_PYTHON_VERSION_ENSURE( [2.4] )
+AZ_PYTHON_CSPEC
+AZ_PYTHON_LSPEC
+
+
+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_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS $CPPFLAGS", [CFLAGS used])
+
+
dnl finally pass CFLAGS to Makefiles via AM_CFLAGS
-CFLAGS=$OPT_CFLAGS
+CFLAGS="$OPT_CFLAGS"
AM_CFLAGS=$ARCH_CFLAGS
+AM_CPPFLAGS="$CPPFLAGS"
AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_CPPFLAGS)
AC_CONFIG_FILES([Makefile]
[contrib/vmlog/Makefile]
[contrib/vmlog/t/Makefile]
[doc/Makefile]
+ [doc/doxygen/Makefile]
[doc/handbook/Makefile]
[man/Makefile]
[src/Makefile]
[src/cacao/Makefile]
[src/cacaoh/Makefile]
+ [src/classes/Makefile]
[src/fdlibm/Makefile]
- [src/lib/Makefile]
[src/mm/Makefile]
[src/mm/cacao-gc/Makefile]
[src/native/Makefile]
[src/native/jvmti/Makefile]
[src/native/vm/Makefile]
[src/native/vm/cldc1.1/Makefile]
- [src/native/vm/gnu/Makefile]
- [src/native/vm/sun/Makefile]
+ [src/native/vm/gnuclasspath/Makefile]
+ [src/native/vm/openjdk/Makefile]
[src/scripts/Makefile]
[src/scripts/java]
[src/threads/Makefile]
- [src/threads/native/Makefile]
[src/threads/none/Makefile]
+ [src/threads/posix/Makefile]
[src/toolbox/Makefile]
[src/vm/Makefile]
[src/vm/jit/Makefile]
[src/vm/jit/i386/linux/Makefile]
[src/vm/jit/intrp/Makefile]
[src/vm/jit/inline/Makefile]
+ [src/vm/jit/ir/Makefile]
[src/vm/jit/loop/Makefile]
[src/vm/jit/m68k/Makefile]
[src/vm/jit/m68k/linux/Makefile]
[src/vmcore/Makefile]
[tests/Makefile]
[tests/regression/Makefile]
- [tests/regression/codepatching/Makefile]
+ [tests/regression/bugzilla/Makefile]
+ [tests/regression/assertion/Makefile]
[tests/regression/jasmin/Makefile]
+ [tests/regression/junit/Makefile]
[tests/regression/native/Makefile]
[tests/regression/resolving/Makefile]
[tests/regression/resolving/classes1/Makefile]
dnl now configure subpackages with OPT_CFLAGS and ARCH_CFLAGS
export OPT_CFLAGS
export ARCH_CFLAGS
+dnl We only build the shared library objects but we use it as
+dnl noinst_LTLIBRARIES
+ac_configure_args="$ac_configure_args --disable-static"
AC_CONFIG_SUBDIRS(src/mm/boehm-gc)