X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=441263b2b5410c52430c5ef97822f1f79a666a33;hb=a87e56e4877bf4b69c48d62f791db1dbc5a9c3c9;hp=0e0443224a73133c25fd5418a3adefbf844344a1;hpb=1a645e4fcbfa6306de34a6e23b7ec37b0b3b7a19;p=cacao.git diff --git a/configure.ac b/configure.ac index 0e0443224..441263b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl 02110-1301, USA. 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) @@ -195,12 +195,6 @@ CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS" 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]) @@ -229,6 +223,8 @@ AC_CHECK_HEADERS([errno.h]) 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]) @@ -244,7 +240,6 @@ AC_CHECK_HEADERS([sys/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]) @@ -273,6 +268,7 @@ AC_FUNC_MEMCMP AC_FUNC_MMAP dnl keep them alpha-sorted! +AC_CHECK_FUNCS([abort]) AC_CHECK_FUNCS([accept]) AC_CHECK_FUNCS([access]) AC_CHECK_FUNCS([atoi]) @@ -323,7 +319,9 @@ 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]) @@ -668,9 +666,14 @@ AC_ARG_ENABLE([ssa], [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") +AM_CONDITIONAL([ENABLE_ESCAPE_CHECK], 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]) + AC_DEFINE([ENABLE_ESCAPE_CHECK], 1, [enable generating code to validate escape analysis results]) + AC_DEFINE([ENABLE_TLH], 1, [enable thread local heap]) ENABLE_LSRA="no" fi @@ -697,7 +700,6 @@ if test x"${ENABLE_LSRA}" = "xyes"; then 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], @@ -766,25 +768,44 @@ AC_SUBST(CACAO_VM_ZIP) 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 @@ -814,10 +835,18 @@ 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] @@ -827,13 +856,14 @@ 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] @@ -841,13 +871,13 @@ AC_CONFIG_FILES([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] @@ -893,9 +923,10 @@ AC_CONFIG_FILES([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]