X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=f4269984191652bb532c79376f54f59c80adc4d2;hb=9a46decdbae4faa43d9e79ea02a902cb709864bb;hp=08e573df16d32063dd9ca03134741a22d2f8b182;hpb=6447f1c33256ff4e5e4b7b97361d259085b100fa;p=cacao.git

diff --git a/configure.ac b/configure.ac
index 08e573df1..f42699841 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.99rc6, cacao@cacaojvm.org)
 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
@@ -666,9 +666,13 @@ 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])
     ENABLE_LSRA="no"
 fi
 
@@ -695,7 +699,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 +767,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_WITH_JRE_LAYOUT
+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"${WITH_JRE_LAYOUT}" = "xno"; then
-   AC_CHECK_WITH_CLASSPATH_LIBDIR
+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.
@@ -782,8 +785,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 +796,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
 
@@ -852,6 +855,7 @@ AC_CONFIG_FILES([Makefile]
 		[contrib/vmlog/Makefile]
 		[contrib/vmlog/t/Makefile]
 		[doc/Makefile]
+		[doc/doxygen/Makefile]
 		[doc/handbook/Makefile]
 		[man/Makefile]
 		[src/Makefile]
@@ -866,8 +870,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]
@@ -933,6 +937,9 @@ AC_CONFIG_FILES([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)