projects / cacao.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* src/vm/jit/i386/codegen.c (codegen): Cleaned up to use REPLACEMENT_
[cacao.git] / configure.ac
diff --git a/configure.ac b/configure.ac
index 45373b48c90cfdc7d7a86eac926452c891ac4187..ec0505bc693c8856ab9b2d717505422f09ce0e49 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,11 @@ i386 | i486 | i586 | i686 )
     ARCH_CFLAGS="-D__I386__"
     ;;
 
+m68k )
+    ARCH_DIR="m68k"
+    ARCH_CFLAGS="-D__M68K__"
+    ;;
+
 mips | mipsel )
     ARCH_DIR="mips"
     ARCH_CFLAGS="-D__MIPS__"
@@ -110,6 +115,13 @@ case "$host_os" in
     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"
@@ -804,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})
@@ -812,52 +824,79 @@ 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)])
 
 
@@ -929,6 +968,8 @@ AC_CONFIG_FILES([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/threads/Makefile]
inofficial http://www.cacaojvm.org/ git mirror