* Merged twisti branch to default. This merge introduces C++ wrapper

[cacao.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1dbd15e1f8afc1490c9d154ec80a75e7f6d86415..3853a5853b4d12ec92d784c5e5b42ba6ae155242 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 
 AC_INIT(cacao, 1.1.0pre, cacao@cacaojvm.org)
-AC_CONFIG_SRCDIR(src/cacao/cacao.c)
+AC_CONFIG_SRCDIR(src/cacao/cacao.cpp)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE([1.9.0 dist-bzip2 tar-ustar])
@@ -37,13 +37,13 @@ AC_PREFIX_DEFAULT(/usr/local/cacao)
 
 dnl Set optimization and debugging for all architectures and systems.
 if test x"$CFLAGS" = "x"; then
-    OPT_CFLAGS="-O0 -g"
+    OPT_CFLAGS="-g -O0"
 else
     OPT_CFLAGS=$CFLAGS
 fi
 
 if test x"$CXXFLAGS" = "x"; then
-    OPT_CXXFLAGS="-O0 -g"
+    OPT_CXXFLAGS="-g -O0"
 else
     OPT_CXXFLAGS=$CXXFLAGS
 fi
@@ -56,7 +56,7 @@ alpha | alphaev56 | alphapca56 )
     JAVA_ARCH="alpha"
     ;;
 
-arm | armv4 | armv4tl | armv5b | armv5l )
+arm | armv4 | armv4tl | armv5b | armv5l | armv5tel | armv5tejl )
     ARCH_DIR="arm"
     ARCH_FLAGS="-D__ARM__"
     JAVA_ARCH="arm"
@@ -70,7 +70,7 @@ hppa2.0 )
 
 i386 | i486 | i586 | i686 )
     ARCH_DIR="i386"
-    ARCH_FLAGS="-D__I386__"
+    ARCH_FLAGS="-m32 -D__I386__"
     JAVA_ARCH="i386"
     ;;
 
@@ -89,13 +89,13 @@ mips | mipsel )
 
 powerpc )
     ARCH_DIR="powerpc"
-    ARCH_FLAGS="-D__POWERPC__"
+    ARCH_FLAGS="-m32 -D__POWERPC__"
     JAVA_ARCH="ppc"
     ;;
 
 powerpc64 )
     ARCH_DIR="powerpc64"
-    ARCH_FLAGS="-D__POWERPC64__"
+    ARCH_FLAGS="-m64 -D__POWERPC64__"
     JAVA_ARCH="ppc64"
     ;;
 
@@ -549,7 +549,6 @@ AC_DEFINE_UNQUOTED([CACAO_VM_ZIP], "${CACAO_VM_ZIP}", [CACAO's vm.zip])
 AC_SUBST(CACAO_VM_ZIP)
 
 
-AC_CHECK_WITH_CACAOH
 AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY
 
 dnl Now we check for jre-layout so we can skip some checks that are
@@ -653,7 +652,6 @@ AC_CONFIG_FILES([Makefile]
                [man/Makefile]
                [src/Makefile]
                [src/cacao/Makefile]
-               [src/cacaoh/Makefile]
                [src/classes/Makefile]
                [src/fdlibm/Makefile]
                [src/mm/Makefile]
@@ -684,6 +682,7 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/jit/i386/darwin/Makefile]
                [src/vm/jit/i386/freebsd/Makefile]
                [src/vm/jit/i386/linux/Makefile]
+               [src/vm/jit/i386/solaris/Makefile]
                [src/vm/jit/intrp/Makefile]
                [src/vm/jit/inline/Makefile]
                [src/vm/jit/ir/Makefile]
@@ -712,6 +711,7 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/jit/x86_64/Makefile]
                [src/vm/jit/x86_64/freebsd/Makefile]
                [src/vm/jit/x86_64/linux/Makefile]
+               [src/vm/jit/x86_64/solaris/Makefile]
                [src/vmcore/Makefile]
                [tests/Makefile]
                [tests/regression/Makefile]