Merged with cldc-branch

[cacao.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7a30b441832e62ce68ab7e43fbbc861fc459b018..60d461a75b1ca6f9f82c36e452da59f039702ca7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,7 @@
 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 
@@ -226,6 +224,8 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 
 dnl keep them alpha-sorted!
+AC_CHECK_HEADERS([assert.h])
+AC_CHECK_HEADERS([errno.h])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([libgen.h])
 AC_CHECK_HEADERS([netdb.h])
@@ -273,6 +273,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])
@@ -282,18 +283,22 @@ AC_CHECK_FUNCS([close])
 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([ftruncate])
 AC_CHECK_FUNCS([getcwd])
 AC_CHECK_FUNCS([gethostbyname])
 AC_CHECK_FUNCS([gethostname])
 AC_CHECK_FUNCS([getpagesize])
 AC_CHECK_FUNCS([getrusage])
 AC_CHECK_FUNCS([getsockname])
+AC_CHECK_FUNCS([getsockopt])
 AC_CHECK_FUNCS([gettimeofday])
 AC_CHECK_FUNCS([htons])
 AC_CHECK_FUNCS([ioctl])
@@ -303,10 +308,14 @@ AC_CHECK_FUNCS([localtime])
 AC_CHECK_FUNCS([localtime_r])
 AC_CHECK_FUNCS([lseek])
 AC_CHECK_FUNCS([malloc])
+AC_CHECK_FUNCS([memcpy])
+AC_CHECK_FUNCS([memset])
 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([scandir])
 AC_CHECK_FUNCS([select])
@@ -314,12 +323,15 @@ AC_CHECK_FUNCS([send])
 AC_CHECK_FUNCS([setsockopt])
 AC_CHECK_FUNCS([shutdown])
 AC_CHECK_FUNCS([socket])
+AC_CHECK_FUNCS([stat])
 AC_CHECK_FUNCS([strchr])
 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.
@@ -493,7 +505,7 @@ fi
 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;;
@@ -564,7 +576,7 @@ AC_CHECK_ENABLE_THREADS
 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;;
@@ -649,7 +661,7 @@ fi
 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;;
@@ -740,6 +752,7 @@ AC_PROG_LIBTOOL
 
 AC_CHECK_ENABLE_STATICVM
 AC_CHECK_ENABLE_ANNOTATIONS
+AC_CHECK_ENABLE_ASSERTION
 
 
 dnl where is CACAO's vm.zip
@@ -792,6 +805,16 @@ AC_CHECK_HEADERS(
        ]
 )
 
+dnl python
+
+AZ_PYTHON_DEFAULT
+AZ_PYTHON_ENABLE
+AZ_PYTHON_WITH
+AZ_PYTHON_VERSION_ENSURE( [2.4] )
+AZ_PYTHON_CSPEC
+AZ_PYTHON_LSPEC
+
+
 dnl finally pass CFLAGS to Makefiles via AM_CFLAGS
 CFLAGS=$OPT_CFLAGS
 AM_CFLAGS=$ARCH_CFLAGS
@@ -842,6 +865,7 @@ AC_CONFIG_FILES([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]
@@ -871,6 +895,7 @@ AC_CONFIG_FILES([Makefile]
                [tests/Makefile]
                [tests/regression/Makefile]
                [tests/regression/codepatching/Makefile]
+               [tests/regression/assertion/Makefile]
                [tests/regression/jasmin/Makefile]
                [tests/regression/native/Makefile]
                [tests/regression/resolving/Makefile]