* src/vm/jit/i386/codegen.c (codegen): Cleaned up to use REPLACEMENT_
[cacao.git] / configure.ac
index 9d1b56af85aa07e4ff0f75d59e1a736b64f42c6d..ec0505bc693c8856ab9b2d717505422f09ce0e49 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(cacao, 0.96+svn, cacao@cacaojvm.org)
+AC_INIT(cacao, 0.97+svn, cacao@cacaojvm.org)
 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
@@ -31,12 +31,22 @@ arm | armv4tl | armv5b | armv5l )
     ARCH_CFLAGS="-D__ARM__"
     ;;
 
+hppa2.0 )
+    ARCH_DIR="parisc"
+    ARCH_CFLAGS="-D__PARISC__"
+    ;;
+
 i386 | i486 | i586 | i686 )
     ARCH_DIR="i386"
     ARCH_CFLAGS="-D__I386__"
     ;;
 
-mips )
+m68k )
+    ARCH_DIR="m68k"
+    ARCH_CFLAGS="-D__M68K__"
+    ;;
+
+mips | mipsel )
     ARCH_DIR="mips"
     ARCH_CFLAGS="-D__MIPS__"
     ;;
@@ -75,6 +85,12 @@ esac
 
 dnl host type
 case "$host_os" in
+*cygwin* )
+    OS_DIR="cygwin"
+    INTRP_CFLAGS="$ARCH_CFLAGS -D__WINDOWS__ -D__CYGWIN__ -Wall -Wno-long-long"
+    ARCH_CFLAGS="$ARCH_CFLAGS -D__WINDOWS__ -D__CYGWIN__ -ansi -pedantic -Wall -Wno-long-long"
+    ;;
+
 *darwin* )
     OS_DIR="darwin"
     INTRP_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -Wall -Wno-long-long"
@@ -93,6 +109,19 @@ case "$host_os" in
     ARCH_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
     ;;
 
+*kfreebsd*-gnu)
+    OS_DIR="freebsd"
+    INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+    ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+    ;;
+
+dnl must be before *linux*
+*uclinux | *elf )
+    OS_DIR="uclinux"
+    INTRP_CFLAGS="$ARCH_CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+    ARCH_CFLAGS="$ARCH_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"
+    ;;
+
 *linux* | *Linux* )
     OS_DIR="linux"
     INTRP_CFLAGS="$ARCH_CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
@@ -114,6 +143,8 @@ dnl temporary set the CFLAGS for configure tests (e.g. inline keyword)
 dnl we set it properly at the end of this file
 CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS"
 
+dnl set interpreter flags
+AC_SUBST(INTRP_CFLAGS)
 
 dnl define some stuff required for --fullversion
 AC_DEFINE_UNQUOTED(VERSION_CONFIGURE_ARGS, "$ac_configure_args", [configure arguments])
@@ -125,7 +156,6 @@ dnl define and substitute some architecture specific variables
 AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [architecture directory])
 AC_SUBST(ARCH_DIR)
 AC_SUBST(OS_DIR)
-AC_SUBST(INTRP_CFLAGS)
 AC_SUBST(USE_SCHEDULER)
 
 
@@ -208,6 +238,32 @@ dnl Features
 
 dnl check arguments
 
+dnl check which Java configuration to use
+AC_MSG_CHECKING(which Java configuration to use)
+AC_ARG_ENABLE([java],
+              [AS_HELP_STRING(--enable-java,enable specific Java configuration (cldc1.1,javase) [[default=javase]])],
+              [case "${enableval}" in
+                   cldc1.1)
+                       ENABLE_JAVAME_CLDC1_1=yes
+                       AC_DEFINE([ENABLE_JAVAME_CLDC1_1], 1, [compile for Java ME CLDC1.1])
+                       AC_MSG_RESULT(cldc1.1)
+                       ;;
+                   javase)
+                       ENABLE_JAVASE=yes
+                       AC_DEFINE([ENABLE_JAVASE], 1, [compile for Java SE])
+                       AC_MSG_RESULT(javase)
+                       ;;
+                   *)
+                       AC_MSG_ERROR(${enableval} is an unknown configuration)
+                       ;;
+               esac],
+               [ENABLE_JAVASE=yes
+                AC_DEFINE([ENABLE_JAVASE], 1, [compile for Java SE])
+                AC_MSG_RESULT(j2se)])
+AM_CONDITIONAL([ENABLE_JAVAME_CLDC1_1], test x"${ENABLE_JAVAME_CLDC1_1}" = "xyes")
+AM_CONDITIONAL([ENABLE_JAVASE], test x"${ENABLE_JAVASE}" = "xyes")
+
+
 dnl check for JIT compiler
 AC_MSG_CHECKING(whether JIT compiler should be compiled)
 AC_ARG_ENABLE([jit],
@@ -291,18 +347,35 @@ fi
 
 
 dnl check for garbage collector usage
-AC_MSG_CHECKING(whether GC should be disabled)
-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")
+AC_ARG_ENABLE([gc], [AS_HELP_STRING(--enable-gc,enable garbage collector support (none,boehm,cacao) [[default=boehm]])])
+AC_MSG_CHECKING(whether GC should be enabled)
+enable_gc=${enable_gc:-boehm}
+case "$enable_gc" in
+no | none)
+    AC_DEFINE([DISABLE_GC], 1, [disable garbage collector])
+    ENABLE_GC=none
+    AC_MSG_RESULT(no)
+    ;;
+
+boehm)
+    AC_DEFINE([ENABLE_GC_BOEHM], 1, [enable conservative boehm-gc])
+    ENABLE_GC=boehm
+    AC_MSG_RESULT(yes, boehm-gc)
+    ;;
+
+cacao)
+    AC_DEFINE([ENABLE_GC_CACAO], 1, [enable exact cacao-gc])
+    ENABLE_GC=cacao
+    AC_MSG_RESULT(yes, cacao-gc)
+    ;;
+
+*)
+    AC_MSG_ERROR($enable_gc is an unknown garbage collector package)
+    ;;
+esac
+AM_CONDITIONAL([DISABLE_GC], test x"${ENABLE_GC}" = "xnone")
+AM_CONDITIONAL([ENABLE_GC_BOEHM], test x"${ENABLE_GC}" = "xboehm")
+AM_CONDITIONAL([ENABLE_GC_CACAO], test x"${ENABLE_GC}" = "xcacao")
 
 
 dnl check for dump memory usage
@@ -340,6 +413,23 @@ fi
 AM_CONDITIONAL([NDEBUG], test x"${NDEBUG}" = "xyes")
 
 
+dnl check for memcheck support
+AC_MSG_CHECKING(whether debugging memory checks should be enabled)
+AC_ARG_ENABLE([memcheck],
+              [AS_HELP_STRING(--enable-memcheck,enable debugging memory checks [[default=no]])],
+              [case "${enableval}" in
+                   yes) ENABLE_MEMCHECK=yes;;
+                   *) ENABLE_MEMCHECK=no;;
+               esac],
+              [ENABLE_MEMCHECK=no])
+AC_MSG_RESULT(${ENABLE_MEMCHECK})
+AM_CONDITIONAL([ENABLE_MEMCHECK], test x"${ENABLE_MEMCHECK}" = "xyes")
+
+if test x"${ENABLE_MEMCHECK}" = "xyes"; then
+    AC_DEFINE([ENABLE_MEMCHECK], 1, [perform debugging memory checks])
+fi
+
+
 dnl check for disassembler support
 AC_MSG_CHECKING(whether disassembler should be enabled)
 AC_ARG_ENABLE([disassembler],
@@ -471,7 +561,7 @@ fi
 
 
 dnl threads
-AC_ARG_ENABLE([threads], [AS_HELP_STRING(--enable-threads,enable threads support (none,green,native) [[default=native]])])
+AC_ARG_ENABLE([threads], [AS_HELP_STRING(--enable-threads,enable threads support (none,native) [[default=native]])])
 AC_ARG_ENABLE([__thread], [AS_HELP_STRING(--enable-__thread,use TLS features)], [use__thread=$enableval], [use__thread=no])
 
 AC_MSG_CHECKING(whether to include threads support)
@@ -726,7 +816,7 @@ AC_SUBST(ENABLE_STATICVM)
 dnl where is CACAO's vm.zip
 AC_MSG_CHECKING(where CACAO's vm.zip is installed)
 AC_ARG_WITH([vm-zip],
-            [AS_HELP_STRING(--with-vm-zip,path to CACAO's vm.zip (includes the name of the file and may be flat) [[default=/usr/local/cacao/share/cacao/vm.zip]])],
+            [AS_HELP_STRING(--with-vm-zip=<path>,path to CACAO's vm.zip (includes the name of the file and may be flat) [[default=/usr/local/cacao/share/cacao/vm.zip]])],
             [CACAO_VM_ZIP=${withval}],
             [CACAO_VM_ZIP=${CACAO_PREFIX}/share/cacao/vm.zip])
 AC_MSG_RESULT(${CACAO_VM_ZIP})
@@ -734,55 +824,96 @@ AC_DEFINE_UNQUOTED([CACAO_VM_ZIP], "${CACAO_VM_ZIP}", [CACAO's vm.zip])
 AC_SUBST(CACAO_VM_ZIP)
 
 
-dnl is GNU classpath installed somewhere different
-AC_MSG_CHECKING(where GNU Classpath is installed)
+dnl which Java core library are we using?
+AC_MSG_CHECKING(which Java core library to use)
+AC_ARG_WITH([classpath],
+            [AS_HELP_STRING(--with-classpath=<type>,specifies which type of classpath to use as Java core library (gnu) [[default=gnu]])],
+            [case "${withval}" in
+                cldc1.1)
+                    WITH_CLASSPATH=cldc1.1
+                    AC_DEFINE([WITH_CLASSPATH_CLDC1_1], 1, [use Sun's CLDC1.1 classes])
+                    AC_SUBST(WITH_CLASSPATH_CLDC1_1)
+                    ;;
+                gnu)
+                    WITH_CLASSPATH=gnu
+                    AC_DEFINE([WITH_CLASSPATH_GNU], 1, [use GNU Classpath])
+                    AC_SUBST(WITH_CLASSPATH_GNU)
+                    ;;
+                *)
+                    AC_MSG_ERROR(unknown classpath ${withval})
+                    ;;
+             esac],
+            [WITH_CLASSPATH=gnu
+             AC_DEFINE([WITH_CLASSPATH_GNU], 1, [use GNU Classpath])
+             AC_SUBST(WITH_CLASSPATH_GNU)])
+AC_MSG_RESULT(${WITH_CLASSPATH})
+AM_CONDITIONAL([WITH_CLASSPATH_CLDC1_1], test x"${WITH_CLASSPATH}" = "xcldc1.1")
+AM_CONDITIONAL([WITH_CLASSPATH_GNU], test x"${WITH_CLASSPATH}" = "xgnu")
+
+
+dnl where is Java core library installed?
+AC_MSG_CHECKING(where Java core library is installed)
 AC_ARG_WITH([classpath-prefix],
-            [AS_HELP_STRING(--with-classpath-prefix=<dir>,installation directory of GNU Classpath [[default=/usr/local/classpath]])],
+            [AS_HELP_STRING(--with-classpath-prefix=<dir>,installation directory of Java core library [[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_DEFINE_UNQUOTED([CLASSPATH_PREFIX], "${CLASSPATH_PREFIX}", [Java core library installation directory])
 AC_SUBST(CLASSPATH_PREFIX)
 
 
-dnl where is GNU Classpath's glibj.zip
-AC_MSG_CHECKING(where GNU Classpath's glibj.zip is installed)
-AC_ARG_WITH([classpath-glibj-zip],
-            [AS_HELP_STRING(--with-classpath-glibj-zip,path to GNU Classpath's glibj.zip (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])],
-            [CLASSPATH_GLIBJ_ZIP=${withval}],
-            [CLASSPATH_GLIBJ_ZIP=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
-AC_MSG_RESULT(${CLASSPATH_GLIBJ_ZIP})
-AC_DEFINE_UNQUOTED([CLASSPATH_GLIBJ_ZIP], "${CLASSPATH_GLIBJ_ZIP}", [GNU Classpath's glibj.zip])
-AC_SUBST(CLASSPATH_GLIBJ_ZIP)
+dnl where are Java core library classes installed?
+AC_MSG_CHECKING(where Java core library classes are installed)
+AC_ARG_WITH([classpath-classes],
+            [AS_HELP_STRING(--with-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])],
+            [CLASSPATH_CLASSES=${withval}],
+            [CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
+AC_MSG_RESULT(${CLASSPATH_CLASSES})
+AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes])
+AC_SUBST(CLASSPATH_CLASSES)
 
 
-dnl where are the GNU Classpath libraries installed
-AC_MSG_CHECKING(where GNU Classpath libraries are installed)
+dnl where are Java core library native libraries installed?
+AC_MSG_CHECKING(where Java core library native 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]])],
+            [AS_HELP_STRING(--with-classpath-libdir=<dir>,installation directory of Java core library native 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])
+AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [Java core library native libraries installation directory])
 AC_SUBST(CLASSPATH_LIBDIR)
 
 
-dnl where are the GNU Classpath headers installed
-AC_MSG_CHECKING(where GNU Classpath headers are installed)
+dnl where are Java core library headers installed?
+AC_MSG_CHECKING(where Java core library headers are installed)
 AC_ARG_WITH([classpath-includedir],
-            [AS_HELP_STRING(--with-classpath-includedir=<dir>,installation directory of GNU Classpath headers [[default=/usr/local/classpath/include]])],
+            [AS_HELP_STRING(--with-classpath-includedir=<dir>,installation directory of Java core library headers [[default=/usr/local/classpath/include]])],
             [CLASSPATH_INCLUDEDIR=${withval}],
             [CLASSPATH_INCLUDEDIR=${CLASSPATH_PREFIX}/include])
 AC_MSG_RESULT(${CLASSPATH_INCLUDEDIR})
 
 AC_CHECK_HEADER([${CLASSPATH_INCLUDEDIR}/jni.h],
-                [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_INCLUDEDIR}/jni.h", [GNU Classpath jni.h header])],
+                [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_INCLUDEDIR}/jni.h", [Java core library jni.h header])],
                 [AC_MSG_ERROR(cannot find jni.h)])
 
 
+dnl if we compile for a JRE-style directory layout
+AC_MSG_CHECKING(if we compile for a JRE-style directory layout)
+AC_ARG_WITH([jre-layout],
+            [AS_HELP_STRING(--with-jre-layout,compile for JRE-style directory layout [[default=no]])],
+            [case "${enableval}" in
+                yes) WITH_JRE_LAYOUT=yes
+                     AC_DEFINE([WITH_JRE_LAYOUT], 1, [with JRE layout])
+                     ;;
+                *) WITH_JRE_LAYOUT=no;;
+             esac],
+            [WITH_JRE_LAYOUT=no])
+AC_MSG_RESULT(${WITH_JRE_LAYOUT})
+
+
 dnl check if GNU Classpath should be linked statically into CACAO
 AC_MSG_CHECKING(whether to link GNU Classpath native libraries statically into CACAO)
 AC_ARG_WITH([static-classpath],
@@ -831,15 +962,16 @@ AC_CONFIG_FILES([Makefile]
                [src/fdlibm/Makefile]
                [src/lib/Makefile]
                [src/mm/Makefile]
+               [src/mm/cacao-gc/Makefile]
                [src/native/Makefile]
                [src/native/include/Makefile]
                [src/native/jvmti/Makefile]
                [src/native/tools/Makefile]
                [src/native/vm/Makefile]
+               [src/native/vm/cldc1.1/Makefile]
+               [src/native/vm/gnu/Makefile]
                [src/scripts/Makefile]
                [src/scripts/java]
-               [src/scripts/rmic]
-               [src/scripts/rmiregistry]
                [src/threads/Makefile]
                [src/threads/native/Makefile]
                [src/threads/none/Makefile]
@@ -851,10 +983,10 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/jit/alpha/freebsd/Makefile]
                [src/vm/jit/alpha/linux/Makefile]
                [src/vm/jit/i386/Makefile]
+               [src/vm/jit/i386/cygwin/Makefile]
                [src/vm/jit/i386/darwin/Makefile]
                [src/vm/jit/i386/freebsd/Makefile]
                [src/vm/jit/i386/linux/Makefile]
-               [src/vm/jit/ifconv/Makefile]
                [src/vm/jit/intrp/Makefile]
                [src/vm/jit/inline/Makefile]
                [src/vm/jit/loop/Makefile]
@@ -862,13 +994,13 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/jit/mips/irix/Makefile]
                [src/vm/jit/mips/linux/Makefile]
                 [src/vm/jit/optimizing/Makefile]
+               [src/vm/jit/parisc/Makefile]
                [src/vm/jit/powerpc/Makefile]
                [src/vm/jit/powerpc/darwin/Makefile]
                [src/vm/jit/powerpc/linux/Makefile]
                [src/vm/jit/powerpc/netbsd/Makefile]
                [src/vm/jit/powerpc64/Makefile]
                [src/vm/jit/powerpc64/linux/Makefile]
-               [src/vm/jit/profile/Makefile]
                [src/vm/jit/schedule/Makefile]
                [src/vm/jit/sparc64/Makefile]
                [src/vm/jit/sparc64/linux/Makefile]
@@ -878,13 +1010,14 @@ AC_CONFIG_FILES([Makefile]
                [tests/Makefile]
                [tests/regression/Makefile]
                [tests/regression/codepatching/Makefile]
+               [tests/regression/jasmin/Makefile]
                [tests/regression/native/Makefile])
 
 
 dnl now configure subpackages with OPT_CFLAGS and ARCH_CFLAGS
 export OPT_CFLAGS
 export ARCH_CFLAGS
-AC_CONFIG_SUBDIRS(src/boehm-gc)
+AC_CONFIG_SUBDIRS(src/mm/boehm-gc)
 
 
 AC_OUTPUT