* configure.in (AC_CONFIG_FILES): Removed tests/native/Makefile, added
[cacao.git] / configure.in
index 00de67b6d23a7b90d8bbeda90705c7654fd8bee3..0168b3fe5266f1d3f2047732539dc8a03dab9c1e 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(cacao, 0.92cvs, cacao@cacaojvm.org)
+AC_INIT(cacao, 0.93+cvs, cacao@cacaojvm.org)
 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
@@ -12,49 +12,52 @@ AM_CONFIG_HEADER([config.h])
 AC_PREFIX_DEFAULT(/usr/local/cacao)
 
 
+dnl set optimization and debugging for all architectures and systems
+if test x"$CFLAGS" = "x"; then
+       CFLAGS="-O0 -g3"
+fi
+
 dnl system type
 case "$host_cpu" in
-alpha | alphaev56 )
+alpha | alphaev56 | alphapca56 )
        ARCH_DIR="alpha"
-        STATIC_CLASSPATH="1"
-       CFLAGS="-mieee -D__ALPHA__"
+       CFLAGS="$CFLAGS -mieee -D__ALPHA__"
+       ;;
+
+arm | armv4tl | armv5b )
+       ARCH_DIR="arm"
+       CFLAGS="$CFLAGS -D__ARM__"
        ;;
 
 i386 | i486 | i586 | i686 )
        ARCH_DIR="i386"
-        STATIC_CLASSPATH="0"
-       CFLAGS="-D__I386__ $CFLAGS"
+       CFLAGS="$CFLAGS -D__I386__"
        ;;
 
 mips )
        ARCH_DIR="mips"
-        STATIC_CLASSPATH="1"
-
-dnl for MIPSPro Compiler
-dnl    CFLAGS="-64 -OPT:Olimit=0 -woff 1110,1164,1515 -D__MIPS__ -D__MIPSEB__"
-       CFLAGS="-64 -OPT:Olimit=0 -D__MIPS__ -D__MIPSEB__"
-
-dnl for GCC
-dnl    CFLAGS="-mabi=64 -D__MIPS__ -D__MIPSEB__"
-dnl    LDFLAGS="-mabi=64"
+       CFLAGS="$CFLAGS -D__MIPS__"
        ;;
 
-powerpc | ppc )
+powerpc )
        ARCH_DIR="powerpc"
-        STATIC_CLASSPATH="1"
-       CFLAGS="-D__POWERPC__"
+       CFLAGS="$CFLAGS -D__POWERPC__"
+       ;;
+
+powerpc64 )
+       ARCH_DIR="powerpc64"
+       CFLAGS="$CFLAGS -D__POWERPC64__"
        ;;
 
 x86_64 )
        ARCH_DIR="x86_64"
-        STATIC_CLASSPATH="0"
-       CFLAGS="-D__X86_64__"
+       CFLAGS="$CFLAGS -D__X86_64__"
        ;;
 
 xdspcore )
        ARCH_DIR="xdspcore"
-       STATIC_CLASSPATH="1"
-       CFLAGS="-D__XDSPCORE__"
+       ENABLE_STATICVM="yes"
+       CFLAGS="$CFLAGS -D__XDSPCORE__"
        USE_SCHEDULER="1"
        ;;
 * )
@@ -62,19 +65,22 @@ xdspcore )
         ;;
 esac
 
-
-dnl set optimization and debugging for all architectures and systems
-CFLAGS="-O0 -g3 $CFLAGS"
-
-
+dnl host type
 case "$host_os" in
 *linux* | *Linux* )
-        CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__LINUX__ -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+       OS_DIR="linux"
+        CFLAGS="$CFLAGS -D__LINUX__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
        ;;
 *darwin* )
-        CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__DARWIN__"
+       OS_DIR="darwin"
+        CFLAGS="$CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
         ;;
+*freebsd* )
+       OS_DIR="freebsd"
+       CFLAGS="$CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
+       ;;
 *irix* )
+       OS_DIR="irix"
         CFLAGS="$CFLAGS -D__IRIX__"
         ;;
 * )
@@ -83,29 +89,26 @@ esac
 
 
 dnl define and substitute some architecture specific variables
-AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [Architecture directory])
+AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [architecture directory])
 AC_SUBST(ARCH_DIR)
+AC_SUBST(OS_DIR)
 AC_SUBST(USE_SCHEDULER)
 
 
-dnl define install prefix
-if test "x$prefix" = xNONE; then
-       CACAO_INSTALL_PREFIX=$ac_default_prefix
-else
-       CACAO_INSTALL_PREFIX=$prefix
-fi
-AC_DEFINE_UNQUOTED([CACAO_INSTALL_PREFIX], "${CACAO_INSTALL_PREFIX}", [Installation prefix])
-AC_SUBST(CACAO_INSTALL_PREFIX)
-
-
 dnl Checks for programs.
 AC_PROG_CC
 AM_PROG_AS
+AC_PROG_LD
+AC_PROG_LD_GNU
 AC_PROG_RANLIB
 AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AM_PROG_MKDIR_P
+
+dnl libtool stuff
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -115,9 +118,20 @@ AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([unistd.h])
 AC_CHECK_HEADERS([sys/ioctl.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_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
+AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
+AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
+AC_C_ATTRIBUTE
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
@@ -125,88 +139,218 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(getcwd gettimeofday mkdir mktime select socket)
+AC_FUNC_MEMCMP
+AC_CHECK_FUNCS([calloc mprotect getpagesize free])
+AC_CHECK_FUNCS([getcwd gettimeofday])
+AC_CHECK_FUNCS([scandir])
+AC_CHECK_FUNCS([mmap])
+AC_CHECK_FUNCS([isnan])
 
 dnl Checks for libraries.
-AC_CHECK_LIB(m, fmod)
-
-dnl Check for mmap header anomalies (missing MAP_FAILED, etc.)
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-       AC_CACHE_CHECK(whether MAP_FAILED is defined,
-                      ac_cv_map_failed,
-                      AC_EGREP_CPP(yes, 
-                                   [#include <sys/mman.h>
-                                    #ifdef MAP_FAILED
-                                       yes
-                                    #endif],
-                                   ac_cv_map_failed=yes,
-                                   ac_cv_map_failed=no))
-
-       AC_CACHE_CHECK(whether MAP_ANONYMOUS is defined,
-                      ac_cv_map_anonymous,
-                      AC_EGREP_CPP(yes, 
-                                   [#include <sys/mman.h>
-                                    #ifdef MAP_ANONYMOUS
-                                       yes
-                                    #endif],
-                                   ac_cv_map_anonymous=yes,
-                                   ac_cv_map_anonymous=no))
-
-       AC_CACHE_CHECK(whether MAP_ANON is defined,
-                      ac_cv_map_anon,
-                      AC_EGREP_CPP(yes, 
-                                   [#include <sys/mman.h>
-                                    #ifdef MAP_ANON
-                                       yes
-                                    #endif],
-                                   ac_cv_map_anon=yes,
-                                   ac_cv_map_anon=no))
-
-       if test $ac_cv_map_failed = yes; then
-               AC_DEFINE([HAVE_MAP_FAILED], 1, [Define if <sys/mman.h> defines MAP_FAILED])
-       fi
 
-       if test $ac_cv_map_anonymous = yes; then
-               AC_DEFINE([HAVE_MAP_ANONYMOUS], 1, [Define if <sys/mman.h> defines MAP_ANONYMOUS])
-       fi
+dnl Checking sizeof void *
+AC_CHECK_SIZEOF(void *)
+AC_C_BIGENDIAN
 
-       if test $ac_cv_map_anon = yes; then
-               AC_DEFINE([HAVE_MAP_ANON], 1, [Define if <sys/mman.h> defines MAP_ANON])
-       fi
+
+dnl check which ld flags are required to export symbols
+if test x"$with_gnu_ld" = "xyes"; then
+    EXPORT_SYMBOLS_FLAGS="-Wl,--export-dynamic"
+else
+    EXPORT_SYMBOLS_FLAGS=""
 fi
+AC_SUBST(EXPORT_SYMBOLS_FLAGS)
+
+
+dnl define install prefix
+if test "x$prefix" = "xNONE"; then
+    CACAO_PREFIX=$ac_default_prefix
+else
+    CACAO_PREFIX=$prefix
+fi
+AC_DEFINE_UNQUOTED([CACAO_PREFIX], "${CACAO_PREFIX}", [installation prefix])
+AC_SUBST(CACAO_PREFIX)
 
 
 dnl Features
 
 dnl check arguments
 
-dnl check for garbage collector
-AC_ARG_ENABLE([gc], [AS_HELP_STRING(--disable-gc,disable garbage collector [[default=yes]])])
+dnl check for JIT compiler
+AC_MSG_CHECKING(whether JIT compiler should be compiled)
+AC_ARG_ENABLE([jit],
+              [AS_HELP_STRING(--disable-jit,disable JIT compiler [[default=yes]])],
+              [case "${enableval}" in
+                   no) ENABLE_JIT=no;;
+                   *) ENABLE_JIT=yes;;
+               esac],
+              [ENABLE_JIT=yes])
+AC_MSG_RESULT(${ENABLE_JIT})
+AM_CONDITIONAL([ENABLE_JIT], test x"${ENABLE_JIT}" = "xyes")
+
+if test x"${ENABLE_JIT}" = "xyes"; then
+    AC_DEFINE([ENABLE_JIT], 1, [enable JIT compiler])
+fi
+
+
+dnl check for interpreter
+AC_ARG_ENABLE([intrp], [AS_HELP_STRING(--enable-intrp,enable interpreter [[default=no]])])
+
+AC_MSG_CHECKING(whether interpreter should be compiled)
+if test x"$enable_intrp" = "xyes"; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE([ENABLE_INTRP], 1, [enable interpreter])
+    AM_CONDITIONAL([ENABLE_INTRP], [true])
+    ENABLE_INTRP=yes
+
+    AC_ASM_SKIP16
+
+    dnl check for libffi
+    AC_ARG_WITH([ffi],
+                [AS_HELP_STRING(--with-ffi,use libffi to call native functions)],
+                [WITH_FFI=yes
+                 AC_CHECK_HEADERS([ffi.h],, [AC_MSG_ERROR(cannot find ffi.h)])
+                 AC_CHECK_LIB(ffi, ffi_call,, [AC_MSG_ERROR(cannot find libffi)])
+                 AC_DEFINE([WITH_FFI], 1, [use libffi])],
+                [WITH_FFI=no])
+
+    dnl check for libffcall
+    AC_ARG_WITH([ffcall],
+                [AS_HELP_STRING(--with-ffcall,use libffcall to call native functions)],
+                [WITH_FFCALL=yes
+                 AC_CHECK_HEADERS([avcall.h],, [AC_MSG_ERROR(cannot find avcall.h)])
+                 AC_CHECK_LIB(avcall, __builtin_avcall,, [AC_MSG_ERROR(cannot find libavcall (from libffcall))])
+                 AC_DEFINE([WITH_FFCALL], 1, [use libffcall])],
+                [WITH_FFCALL=no])
+
+    dnl check for libffi or libffcall
+    if test x"${WITH_FFI}" = "xyes" -a x"${WITH_FFCALL}" = "xyes"; then
+        AC_ERROR(Enable only libffi or libffcall.)
+    fi
+    if test x"${WITH_FFI}" = "xno" -a x"${WITH_FFCALL}" = "xno"; then
+        AC_ERROR(Enable one of libffi or libffcall.)
+    fi
+
+else
+    AC_MSG_RESULT(no)
+    AM_CONDITIONAL([ENABLE_INTRP], [false])
+    ENABLE_INTRP="no"
+fi
+
+if test x"${ENABLE_JIT}" = "xno" -a x"${ENABLE_INTRP}" = "xno"; then
+    AC_ERROR(You have to enable at least the JIT or the interpreter.)
+fi
+
 
+dnl check for garbage collector usage
 AC_MSG_CHECKING(whether GC should be disabled)
-if test x"$disable_gc" = "xyes"; then
-       AC_MSG_RESULT(yes)
-       AM_CONDITIONAL([DISABLE_GC], [true])
+AC_ARG_ENABLE([gc],
+              [AS_HELP_STRING(--disable-gc,disable garbage collector (for debugging only!) [[default=yes]])],
+              [case "${enableval}" in
+                   no) DISABLE_GC=yes
+                       AC_DEFINE([DISABLE_GC], 1, [disable garbage collector])
+                       ;;
+                   *) DISABLE_GC=no;;
+               esac],
+              [DISABLE_GC=no])
+AC_MSG_RESULT(${DISABLE_GC})
+AM_CONDITIONAL([DISABLE_GC], test x"${DISABLE_GC}" = "xyes")
+
+
+dnl check for dump memory usage
+AC_MSG_CHECKING(whether dump memory should be disabled)
+AC_ARG_ENABLE([dump],
+              [AS_HELP_STRING(--disable-dump,disable dump memory (for debugging only!) [[default=yes]])],
+              [case "${enableval}" in
+                   no)
+                       DISABLE_DUMP=yes
+                       AC_DEFINE([DISABLE_DUMP], 1, [disable dump memory])
+                       ;;
+                   *) DISABLE_DUMP=no;;
+               esac],
+               [DISABLE_DUMP=no])
+AC_MSG_RESULT(${DISABLE_DUMP})
+
+
+dnl check for debug
+AC_MSG_CHECKING(whether debug code generation should be enabled)
+AC_ARG_ENABLE([debug],
+              [AS_HELP_STRING(--disable-debug,disable debug code generation [[default=yes]])],
+              [case "${enableval}" in
+                   no) NDEBUG=yes
+                       AC_DEFINE([NDEBUG], 1, [disable debug code])
+                       ;;
+                   *) NDEBUG=no;;
+               esac],
+              [NDEBUG=no])
+
+if test x"${NDEBUG}" = "xno"; then
+    AC_MSG_RESULT(yes)
+
+    dnl check for binutils headers and libraries on some architectures for the
+    dnl disassembler
+    case "${ARCH_DIR}" in
+        arm | i386 | powerpc | x86_64 )
+            AC_CHECK_HEADER([ansidecl.h],, [AC_MSG_ERROR(cannot find ansidecl.h)])
+            AC_CHECK_HEADER([symcat.h],, [AC_MSG_ERROR(cannot find symcat.h)])
+            AC_CHECK_HEADER([bfd.h],, [AC_MSG_ERROR(cannot find bfd.h)])
+            AC_CHECK_HEADER([dis-asm.h],, [AC_MSG_ERROR(cannot find dis-asm.h)])
+
+            case "${OS_DIR}" in
+                cygwin | darwin )
+                     AC_CHECK_LIB(intl, dcgettext,, [AC_MSG_ERROR(cannot find libintl (from bintuils))])
+                     ;;
+            esac
+
+            AC_CHECK_LIB(iberty, xstrerror,, [AC_MSG_ERROR(cannot find libiberty (from bintuils))])
+            AC_CHECK_LIB(bfd, bfd_get_arch,, [AC_MSG_ERROR(cannot find libbfd (from bintuils))])
+            AC_CHECK_LIB(opcodes, init_disassemble_info,, [AC_MSG_ERROR(cannot find libopcodes (from bintuils))])
+            AC_DEFINE([WITH_BINUTILS_DISASSEMBLER], 1, [use binutils disassembler])
+            AM_CONDITIONAL([WITH_BINUTILS_DISASSEMBLER], [true])
+            ;;
+        * )
+            AM_CONDITIONAL([WITH_BINUTILS_DISASSEMBLER], [false])
+            ;;
+    esac
+
 else
-       AC_MSG_RESULT(no)
-       AM_CONDITIONAL([DISABLE_GC], [false])
+    AC_MSG_RESULT(no)
 fi
+AM_CONDITIONAL([NDEBUG], test x"${NDEBUG}" = "xno")
 
 
 dnl check for statistics
-AC_ARG_ENABLE([statistics], [AS_HELP_STRING(--disable-statistics,disable statistics generation [[default=yes]])])
-
 AC_MSG_CHECKING(whether statistics generation should be enabled)
-if test x"$enable_statistics" = "xno"; then
-       AC_MSG_RESULT(no)
-       AM_CONDITIONAL([STATISTICS], [false])
-else
-       AC_MSG_RESULT(yes)
-       AC_DEFINE([STATISTICS], 1, [use statistics])
-       AM_CONDITIONAL([STATISTICS], [true])
+AC_ARG_ENABLE([statistics],
+              [AS_HELP_STRING(--disable-statistics,disable statistics generation [[default=yes]])],
+              [case "${enableval}" in
+                   no) ENABLE_STATISTICS=no;;
+                   *) ENABLE_STATISTICS=yes;;
+               esac],
+              [ENABLE_STATISTICS=yes])
+AC_MSG_RESULT(${ENABLE_STATISTICS})
+AM_CONDITIONAL([ENABLE_STATISTICS], test x"${ENABLE_STATISTICS}" = "xyes")
+
+if test x"${ENABLE_STATISTICS}" = "xyes"; then
+    AC_DEFINE([ENABLE_STATISTICS], 1, [enable statistics])
+fi
+
+
+dnl check for JVMTI
+AC_MSG_CHECKING(whether to compile JVMTI support)
+AC_ARG_ENABLE([jvmti],
+              [AS_HELP_STRING(--enable-jvmti,enable JVMTI [[default=no]])],
+              [case "${enableval}" in
+                   yes) ENABLE_JVMTI=yes;;
+                   *) ENABLE_JVMTI=no;;
+               esac],
+              [ENABLE_JVMTI=no])
+AC_MSG_RESULT(${ENABLE_JVMTI})
+AM_CONDITIONAL([ENABLE_JVMTI], test x"${ENABLE_JVMTI}" = "xyes")
+
+if test x"${ENABLE_JVMTI}" = "xyes"; then
+    AC_DEFINE([ENABLE_JVMTI], 1, [use JVMTI])
 fi
 
 
@@ -227,8 +371,6 @@ no | none | single)
 
 green | native | posix | pthreads)
        AC_DEFINE([USE_THREADS], 1, [use threads])
-       AC_DEFINE([EXTERNAL_OVERFLOW], 1, [external overflow])
-       AC_DEFINE([DONT_FREE_FIRST], 1, [don't free first])
 
        AM_CONDITIONAL([USE_THREADS], [true])
 
@@ -240,14 +382,14 @@ green | native | posix | pthreads)
                CFLAGS="$CFLAGS -D_REENTRANT"
 
                dnl tell boehm to support threads as well
-               CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-boehm-threads=posix"
+               ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
                AM_CONDITIONAL([NATIVE_THREADS], [true])
 
        else
                AC_MSG_RESULT(yes, green)
 
                dnl no threads for boehm
-               CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-boehm-threads"
+               ac_configure_args="$ac_configure_args --disable-boehm-threads"
                AM_CONDITIONAL([NATIVE_THREADS], [false])
        fi
     ;;
@@ -278,14 +420,19 @@ fi
 
 
 dnl check if linear scan register allocator(lsra) should be used
-AC_ARG_ENABLE([lsra], [AS_HELP_STRING(--enable-lsra,enable linear scan register allocator [[default=yes]])])
-
 AC_MSG_CHECKING(whether lsra should be supported)
-if test x"$enable_lsra" = "xno"; then
-       AC_MSG_RESULT(no)
-else
-       AC_MSG_RESULT(yes)
-       AC_DEFINE([LSRA], 1, [use lsra])
+AC_ARG_ENABLE([lsra],
+              [AS_HELP_STRING(--enable-lsra,enable linear scan register allocator [[default=yes]])],
+              [case "${enableval}" in
+                   no) ENABLE_LSRA=no;;
+                   *) ENABLE_LSRA=yes;;
+               esac],
+              [ENABLE_LSRA=yes])
+AC_MSG_RESULT(${ENABLE_LSRA})
+AM_CONDITIONAL([ENABLE_LSRA], test x"${ENABLE_LSRA}" = "xyes")
+   
+if test x"${ENABLE_LSRA}" = "xyes"; then
+    AC_DEFINE([ENABLE_LSRA], 1, [enable lsra])
 fi
 
 
@@ -326,142 +473,118 @@ fi
 
 
 dnl check if zlib should be used
-AC_ARG_ENABLE([zlib], [AS_HELP_STRING(--enable-zlib,enable zip archive class storage (needs zlib) [[default=yes]])])
-
 AC_MSG_CHECKING(whether zip archives should be supported)
-if test x"$enable_zlib" = "xno"; then
-       AC_MSG_RESULT(no)
-       AM_CONDITIONAL([USE_ZLIB], [false])
-else
-       AC_MSG_RESULT(yes)
-       AC_DEFINE([USE_ZLIB], 1, [use zlib])
-        AC_CHECK_HEADERS([zlib.h])
-        AC_CHECK_LIB(z, main)
-       AM_CONDITIONAL([USE_ZLIB], [true])
+AC_ARG_ENABLE([zlib],
+              [AS_HELP_STRING(--enable-zlib,enable zip archive class storage (needs zlib) [[default=yes]])],
+              [case "${enableval}" in
+                  no) ENABLE_ZLIB=yes;;
+                  *) ENABLE_ZLIB=no;;
+               esac],
+              [ENABLE_ZLIB=yes])
+AC_MSG_RESULT(${ENABLE_ZLIB})
+
+if test x"${ENABLE_ZLIB}" = "xyes"; then
+    AC_CHECK_HEADERS([zconf.h],, [AC_MSG_ERROR(cannot find zconf.h)])
+    AC_CHECK_HEADERS([zlib.h],, [AC_MSG_ERROR(cannot find zlib.h)])
+    AC_CHECK_LIB(z, inflate,, [AC_MSG_ERROR(cannot find libz)])
+    AC_DEFINE([ENABLE_ZLIB], 1, [use zlib])
 fi
+AM_CONDITIONAL([ENABLE_ZLIB], test x"${ENABLE_ZLIB}" = "xyes")
 
 
-dnl check if classpath should be linked statically with CACAO
-AC_ARG_ENABLE([dynamicclasspath], [AS_HELP_STRING(--disable-dynamicclasspath, link classpath native code static even on platforms supporting dynamic loading)], [use_dynamicclasspath=$enableval], [use_dynamicclasspath=yes])
+dnl check if CACAO should be linked statically
+AC_MSG_CHECKING(whether to link GNU classpath native libraries statically into CACAO)
+AC_ARG_ENABLE([staticvm],
+              [AS_HELP_STRING(--enable-staticvm, link GNU classpath native libraries statically into CACAO [[default=no]])],
+              [case "${enableval}" in
+                  yes) ENABLE_STATICVM=yes;;
+                  *) ENABLE_STATICVM=no;;
+               esac],
+              [ENABLE_STATICVM=no])
+AC_MSG_RESULT(${ENABLE_STATICVM})
 
-AC_MSG_CHECKING(whether to link GNU classpath statically)
-if test x"$use_dynamicclasspath" = "xno"; then
-       STATIC_CLASSPATH="1"
-fi
+if test x"${ENABLE_STATICVM}" = "xyes"; then
+    AC_DEFINE([ENABLE_STATICVM], 1, [link CACAO statically])
 
-if test x"${STATIC_CLASSPATH}" = "x1"; then
-       AC_MSG_RESULT(yes)
-       AM_CONDITIONAL([STATIC_CLASSPATH], [true])
+    dnl check for some classpath related stuff when we link statically
+    AM_ICONV_LINK
 else
-       AC_MSG_RESULT(no)
-       AM_CONDITIONAL([STATIC_CLASSPATH], [false])
+    AC_CHECK_HEADERS([ltdl.h],, [AC_MSG_ERROR(cannot find ltdl.h)])
+    AC_CHECK_LIB(ltdl, lt_dlopen,, [AC_MSG_ERROR(cannot find libltdl)])
 fi
-AC_SUBST(STATIC_CLASSPATH)
+AM_CONDITIONAL([ENABLE_STATICVM], test x"${ENABLE_STATICVM}" = "xyes")
+AC_SUBST(ENABLE_STATICVM)
 
 
-dnl enable gtk peer
-AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])])
+dnl is GNU classpath installed somewhere different
+AC_MSG_CHECKING(where GNU Classpath is installed)
+AC_ARG_WITH([classpath-prefix],
+            [AS_HELP_STRING(--with-classpath-prefix=<dir>,installation directory of GNU Classpath [[default=/usr/local/classpath]])],
+            [CLASSPATH_PREFIX=${withval}],
+            [CLASSPATH_PREFIX=/usr/local/classpath])
+AC_MSG_RESULT(${CLASSPATH_PREFIX})
+AC_DEFINE_UNQUOTED([CLASSPATH_PREFIX], "${CLASSPATH_PREFIX}", [GNU Classpath installation directory])
+AC_SUBST(CLASSPATH_PREFIX)
 
-AC_MSG_CHECKING(whether to use GTK awt peers)
-if test x"$enable_gtk_peer" = "xyes"; then
-       AC_MSG_RESULT(yes)
-       AC_DEFINE([USE_GTK], 1, [use gtk])
-       AM_CONDITIONAL([USE_GTK_PEER], [true])
-       USE_GTK_PEER=yes
-else
-       AC_MSG_RESULT(no)
-       AM_CONDITIONAL([USE_GTK_PEER], [false])
-       CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-gtk-peer"
-       USE_GTK_PEER=no
-fi
-AC_SUBST(USE_GTK_PEER)
-
-
-dnl pass configure options to classpath
-if test x"${STATIC_CLASSPATH}" = "x1"; then
-        AC_DEFINE([STATIC_CLASSPATH], 1, [use classpath statically linked])
-       AM_CONDITIONAL([STATIC_CLASSPATH], [true])
-       CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-static --disable-shared"
-
-
-       dnl check for some classpath related stuff when we link statically
-       AM_ICONV_LINK
-
-       dnl taken from GNU classpath configure.ac
-       if test x"${USE_GTK_PEER}" = "xyes"; then
-               AC_ERROR(XXX this is not supported yet)
-               AC_PATH_XTRA
-               if test "$no_x" = yes; then
-                       AC_MSG_ERROR([GTK+ peers requested but no X library available])
-               fi
-               dnl We explicitly want the XTest Extension for Robot support.
-               AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
-                            [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])],
-                            [${X_LIBS}])
-               PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0)
-               AC_SUBST(GTK_CFLAGS)
-               AC_SUBST(GTK_LIBS)
-
-               AC_SUBST(CAIRO_LIBS)
-               AC_SUBST(CAIRO_CFLAGS)
-       fi
-       PKG_CHECK_MODULES(PANGOFT2, pangoft2)
-       AC_SUBST(PANGOFT2_LIBS)
-       AC_SUBST(PANGOFT2_CFLAGS)
-else
-       AM_CONDITIONAL([STATIC_CLASSPATH], [false])
-       CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-static --enable-shared"
-fi
+AC_MSG_CHECKING(where GNU Classpath libraries are installed)
+AC_ARG_WITH([classpath-libdir],
+            [AS_HELP_STRING(--with-classpath-libdir=<dir>,installation directory of GNU Classpath libraries [[default=/usr/local/classpath/lib]])],
+            [CLASSPATH_LIBDIR=${withval}],
+            [CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib])
+AC_MSG_RESULT(${CLASSPATH_LIBDIR})
 
+dnl expand CLASSPATH_LIBDIR to something that is usable in C code
+AS_AC_EXPAND([CLASSPATH_LIBDIR], ${CLASSPATH_LIBDIR})
+AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [GNU Classpath libraries installation directory])
 
-dnl should we use an external classpath installation
-AC_ARG_WITH([external-classpath], [AS_HELP_STRING(--with-external-classpath=<dir>,installation directory of external GNU classpath [[default=no]])])
+AC_SUBST(CLASSPATH_LIBDIR)
 
-AC_MSG_CHECKING(whether to use an external GNU classpath)
-if test x"$with_external_classpath" != "x"; then
-       if test x"$with_external_classpath" = "xyes"; then
-               AC_MSG_ERROR(please specify the installation prefix)
-       fi
-       AC_MSG_RESULT($with_external_classpath)
-       AC_DEFINE([WITH_EXTERNAL_CLASSPATH], 1, [external classpath])
-       AM_CONDITIONAL([WITH_EXTERNAL_CLASSPATH], [true])
-       EXTERNAL_CLASSPATH_PREFIX="$with_external_classpath"
-       AC_DEFINE_UNQUOTED([EXTERNAL_CLASSPATH_PREFIX], "${EXTERNAL_CLASSPATH_PREFIX}", [external classpath directory])
-       AC_SUBST(EXTERNAL_CLASSPATH_PREFIX)
+
+
+dnl Maybe the user has Classpath installed 'flat'.
+AC_ARG_WITH([flat-classpath], [AS_HELP_STRING(--with-flat-classpath, GNU Classpath is not zipped in the install directory)])
+if test x"$with_flat_classpath" = "x"; then
+       GLIBJZ=glibj.zip
 else
-       AC_MSG_RESULT(no)
-       AM_CONDITIONAL([WITH_EXTERNAL_CLASSPATH], [false])
+       GLIBJZ=
 fi
+AC_SUBST(GLIBJZ)
+AC_DEFINE_UNQUOTED(GLIBJZ_STRING, "$GLIBJZ", [define to the string base name of the classpath zip file])
 
 
-dnl set some essential classpath options, even if their classpath default is
-dnl suitable for us
-ac_configure_args="$ac_configure_args --libdir=${CACAO_INSTALL_PREFIX}/jre/lib/${ARCH_DIR} --enable-jni --disable-cni --disable-regen-headers ${CONFIGURE_ARGS}"
+dnl check for some programs we need
+AC_PROG_JAVAC
+AC_PATH_PROG(ZIP, zip)
+if test -z "${ZIP}"; then
+    AC_MSG_ERROR([cannot find zip])
+fi
 
 
-dnl now configure boehm gc and gnu classpath
+dnl now configure subpackages
 dnl the export is not my favorite (is there another way?)
 export CFLAGS
-AC_CONFIG_SUBDIRS(src/boehm-gc src/classpath)
-
+AC_CONFIG_SUBDIRS(src/boehm-gc)
 
 AC_CONFIG_FILES([Makefile]
+               [contrib/Makefile]
+               [contrib/setenvinstalled]
+               [contrib/setenvsource]
                [doc/Makefile]
                [doc/handbook/Makefile]
                [man/Makefile]
                [src/Makefile]
                [src/cacao/Makefile]
                [src/cacaoh/Makefile]
+               [src/fdlibm/Makefile]
                [src/lib/Makefile]
                [src/mm/Makefile]
                [src/native/Makefile]
                [src/native/include/Makefile]
+               [src/native/jvmti/Makefile]
                [src/native/tools/Makefile]
                [src/native/vm/Makefile]
                [src/scripts/Makefile]
-               [src/scripts/cacao]
                [src/scripts/java]
-               [src/scripts/rmic]
                [src/scripts/rmiregistry]
                [src/threads/Makefile]
                [src/threads/green/Makefile]
@@ -469,19 +592,30 @@ AC_CONFIG_FILES([Makefile]
                [src/toolbox/Makefile]
                [src/vm/Makefile]
                [src/vm/jit/Makefile]
+               [src/vm/jit/allocator/Makefile]
                [src/vm/jit/alpha/Makefile]
+               [src/vm/jit/alpha/freebsd/Makefile]
+               [src/vm/jit/alpha/linux/Makefile]
                [src/vm/jit/i386/Makefile]
+               [src/vm/jit/i386/freebsd/Makefile]
+               [src/vm/jit/i386/linux/Makefile]
+               [src/vm/jit/intrp/Makefile]
                [src/vm/jit/inline/Makefile]
                [src/vm/jit/loop/Makefile]
                [src/vm/jit/mips/Makefile]
+               [src/vm/jit/mips/irix/Makefile]
+               [src/vm/jit/mips/linux/Makefile]
                [src/vm/jit/powerpc/Makefile]
+               [src/vm/jit/powerpc/darwin/Makefile]
+               [src/vm/jit/powerpc/linux/Makefile]
                [src/vm/jit/schedule/Makefile]
                [src/vm/jit/tools/Makefile]
                [src/vm/jit/verify/Makefile]
                [src/vm/jit/x86_64/Makefile]
                [tests/Makefile]
-               [tests/kaffe/Makefile]
-               [tests/native/Makefile])
+               [tests/regression/Makefile]
+               [tests/regression/codepatching/Makefile]
+               [tests/regression/native/Makefile])
 
 AC_OUTPUT