* Merged gc7-branch to default.

[cacao.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8984d943eaad0b940f2544d579163170267ce643..9fb212d06324920a1640404d3b2ece608c297c50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -666,9 +666,11 @@ 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")
 
 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
 
@@ -695,7 +697,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],
@@ -764,17 +765,17 @@ AC_SUBST(CACAO_VM_ZIP)
 
 
 AC_CHECK_WITH_CACAOH
-AC_CHECK_WITH_CLASSPATH
+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_CLASSPATH_PREFIX
-AC_CHECK_WITH_CLASSPATH_CLASSES
+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_CLASSPATH_LIBDIR
+   AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
 fi
 
 dnl The check for jni_md.h must be before jni.h.
@@ -782,8 +783,8 @@ AC_CHECK_WITH_JNI_MD_H
 AC_CHECK_WITH_JNI_H
 
 dnl HPI is only required for OpenJDK
-case "${WITH_CLASSPATH}" in
-    sun)
+case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+    openjdk)
         AC_CHECK_WITH_HPI_MD_H
         AC_CHECK_WITH_HPI_H
         ;;
@@ -793,15 +794,15 @@ 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
 
@@ -867,8 +868,8 @@ 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]