* asm_handle_nullptr_exception: removed

[cacao.git] / configure.in

diff --git a/configure.in b/configure.in
index 5fbcbfcba86f9cfaf261185dbaca349ba9d541b5..b6a8421622fd64c45f798394520324ede5b229e3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl system type
 case "$host_cpu" in
 alpha | alphaev56 )
        ARCH_DIR="alpha"
-        STATIC_CLASSPATH="1"
+        STATIC_CLASSPATH="0"
        CFLAGS="-mieee -D__ALPHA__"
        ;;
 
@@ -28,17 +28,16 @@ arm )
 
 i386 | i486 | i586 | i686 )
        ARCH_DIR="i386"
-        STATIC_CLASSPATH="0"
        CFLAGS="-D__I386__ $CFLAGS"
        ;;
 
 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    CFLAGS="-D__MIPS__ -D__MIPSEB__"
 
 dnl for GCC
 dnl    CFLAGS="-mabi=64 -D__MIPS__ -D__MIPSEB__"
@@ -47,13 +46,11 @@ dnl LDFLAGS="-mabi=64"
 
 powerpc )
        ARCH_DIR="powerpc"
-        STATIC_CLASSPATH="1"
        CFLAGS="-D__POWERPC__"
        ;;
 
 x86_64 )
        ARCH_DIR="x86_64"
-        STATIC_CLASSPATH="0"
        CFLAGS="-D__X86_64__"
        ;;
 
@@ -82,6 +79,10 @@ case "$host_os" in
        OS_DIR="darwin"
         CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__DARWIN__"
         ;;
+*freebsd* )
+       OS_DIR="freebsd"
+       CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__FREEBSD__ -D_XOPEN_SOURCE_EXTENDED"
+       ;;
 *irix* )
        OS_DIR="irix"
         CFLAGS="$CFLAGS -D__IRIX__"
@@ -98,25 +99,22 @@ 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
 
+dnl libtool stuff
+AC_LIBTOOL_DLOPEN
+AC_LIBLTDL_CONVENIENCE
+AC_PROG_LIBTOOL
+AC_SUBST(LIBLTDL)
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -193,6 +191,25 @@ if test $ac_cv_func_mmap_fixed_mapped = yes; then
 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_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 Features
 
 dnl check arguments
@@ -201,7 +218,7 @@ dnl check for garbage collector
 AC_ARG_ENABLE([gc], [AS_HELP_STRING(--disable-gc,disable garbage collector [[default=yes]])])
 
 AC_MSG_CHECKING(whether GC should be disabled)
-if test x"$disable_gc" = "xyes"; then
+if test x"$enable_gc" = "xno"; then
        AC_MSG_RESULT(yes)
        AM_CONDITIONAL([DISABLE_GC], [true])
 else
@@ -209,7 +226,6 @@ else
        AM_CONDITIONAL([DISABLE_GC], [false])
 fi
 
-
 dnl check for statistics
 AC_ARG_ENABLE([statistics], [AS_HELP_STRING(--disable-statistics,disable statistics generation [[default=yes]])])
 
@@ -455,7 +471,7 @@ ac_configure_args="$ac_configure_args --libdir=${CACAO_INSTALL_PREFIX}/jre/lib/$
 dnl now configure boehm gc and gnu classpath
 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 src/classpath src/libltdl)
 
 
 AC_CONFIG_FILES([Makefile]
@@ -484,7 +500,10 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/Makefile]
                [src/vm/jit/Makefile]
                [src/vm/jit/alpha/Makefile]
+               [src/vm/jit/arm/Makefile]
                [src/vm/jit/i386/Makefile]
+               [src/vm/jit/i386/linux/Makefile]
+               [src/vm/jit/i386/freebsd/Makefile]
                [src/vm/jit/inline/Makefile]
                [src/vm/jit/loop/Makefile]
                [src/vm/jit/mips/Makefile]