X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=62b76eb92258b3241ffa17c9e805271b2cfbeb15;hb=bfb7d15b502b8170ec8a9b348c546418c0e44ace;hp=05284e9099bc4a68726a95941f2c8a17c058d101;hpb=a1159b52f19fb0e9272c1e80491fe90569179c2a;p=cacao.git diff --git a/configure.ac b/configure.ac index 05284e909..62b76eb92 100644 --- a/configure.ac +++ b/configure.ac @@ -22,12 +22,12 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA dnl 02110-1301, USA. dnl -dnl $Id: configure.ac 7441 2007-03-02 23:13:10Z michi $ +dnl $Id: configure.ac 7902 2007-05-11 22:33:15Z twisti $ dnl Process this file with autoconf to produce a configure script. -AC_INIT(cacao, 0.97+svn, cacao@cacaojvm.org) +AC_INIT(cacao, 0.98rc, cacao@cacaojvm.org) AC_CONFIG_SRCDIR(src/cacao/cacao.c) AC_CANONICAL_HOST AC_PREREQ(2.59) @@ -53,7 +53,7 @@ alpha | alphaev56 | alphapca56 ) ARCH_CFLAGS="-mieee -D__ALPHA__" ;; -arm | armv4tl | armv5b | armv5l ) +arm | armv4 | armv4tl | armv5b | armv5l ) ARCH_DIR="arm" ARCH_CFLAGS="-D__ARM__" ;; @@ -88,6 +88,11 @@ powerpc64 ) ARCH_CFLAGS="-D__POWERPC64__" ;; +s390 ) + ARCH_DIR="s390" + ARCH_CFLAGS="-D__S390__" + ;; + sparc | sparc64 ) ARCH_DIR="sparc64" ARCH_CFLAGS="-mcpu=v9 -m64 -D__SPARC_64__" @@ -105,12 +110,6 @@ xdspcore ) USE_SCHEDULER="1" ;; -s390 ) - ARCH_DIR="s390" - ARCH_CFLAGS="-D__S390__" - ;; - - * ) AC_MSG_ERROR($host_cpu systems are not supported at this time) ;; @@ -213,10 +212,16 @@ AM_PROG_MKDIR_P dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC + +dnl keep them alpha-sorted! AC_CHECK_HEADERS([fcntl.h]) -AC_CHECK_HEADERS([sys/time.h]) +AC_CHECK_HEADERS([string.h]) +AC_CHECK_HEADERS([time.h]) AC_CHECK_HEADERS([unistd.h]) AC_CHECK_HEADERS([sys/ioctl.h]) +AC_CHECK_HEADERS([sys/mman.h]) +AC_CHECK_HEADERS([sys/resource.h]) +AC_CHECK_HEADERS([sys/time.h]) dnl this is for fdlibm AC_CHECK_HEADERS([stdint.h]) @@ -242,10 +247,23 @@ AC_PROG_GCC_TRADITIONAL AC_TYPE_SIGNAL AC_FUNC_MEMCMP AC_FUNC_MMAP -AC_CHECK_FUNCS([calloc mmap getpagesize free]) -AC_CHECK_FUNCS([getcwd gettimeofday]) -AC_CHECK_FUNCS([scandir]) + +dnl keep them alpha-sorted! +AC_CHECK_FUNCS([calloc]) +AC_CHECK_FUNCS([getpagesize]) +AC_CHECK_FUNCS([free]) +AC_CHECK_FUNCS([getcwd]) +AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_FUNCS([getrusage]) AC_CHECK_FUNCS([isnan]) +AC_CHECK_FUNCS([localtime]) +AC_CHECK_FUNCS([localtime_r]) +AC_CHECK_FUNCS([mmap]) +AC_CHECK_FUNCS([mprotect]) +AC_CHECK_FUNCS([scandir]) +AC_CHECK_FUNCS([strdup]) +AC_CHECK_FUNCS([time]) + dnl Checks for libraries. @@ -280,6 +298,9 @@ dnl Features AC_CHECK_ENABLE_JAVA AC_CHECK_ENABLE_JIT +dnl with-options +AC_CHECK_WITH_CACAOH + dnl check for stuff that should be done in software AC_CHECK_SOFTFLOAT AC_CHECK_SOFT_FLOAT_CMP @@ -367,6 +388,7 @@ 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 AC_MSG_CHECKING(whether dump memory should be disabled) AC_ARG_ENABLE([dump], @@ -419,6 +441,23 @@ if test x"${ENABLE_MEMCHECK}" = "xyes"; then fi +dnl check for vmlog support +AC_MSG_CHECKING(whether vmlog tracing should be enabled) +AC_ARG_ENABLE([vmlog], + [AS_HELP_STRING(--enable-vmlog,enable vmlog tracing [[default=no]])], + [case "${enableval}" in + yes) ENABLE_VMLOG=yes;; + *) ENABLE_VMLOG=no;; + esac], + [ENABLE_VMLOG=no]) +AC_MSG_RESULT(${ENABLE_VMLOG}) +AM_CONDITIONAL([ENABLE_VMLOG], test x"${ENABLE_VMLOG}" = "xyes") + +if test x"${ENABLE_VMLOG}" = "xyes"; then + AC_DEFINE([ENABLE_VMLOG], 1, [enable vmlog tracing code]) +fi + + dnl check for disassembler support AC_MSG_CHECKING(whether disassembler should be enabled) AC_ARG_ENABLE([disassembler], @@ -437,7 +476,7 @@ if test x"${ENABLE_DISASSEMBLER}" = "xyes"; then dnl check for binutils headers and libraries on some architectures for the dnl disassembler case "${ARCH_DIR}" in - arm | i386 | powerpc | x86_64 | sparc64 | powerpc64 | s390) + arm | i386 | powerpc | x86_64 | sparc64 | powerpc64 | s390 | m68k) 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)]) @@ -549,61 +588,7 @@ if test x"${ENABLE_JVMTI}" = "xyes"; then fi -dnl threads -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) -enable_threads=${enable_threads:-native} -case "$enable_threads" in -no | none | single) - AC_MSG_RESULT(no) - dnl no threads for boehm - ac_configure_args="$ac_configure_args --disable-boehm-threads" - AM_CONDITIONAL([ENABLE_THREADS], [false]) - ;; - -native | posix | pthreads) - AC_DEFINE([ENABLE_THREADS], 1, [enable threads]) - - AM_CONDITIONAL([ENABLE_THREADS], [true]) - - AC_MSG_RESULT(yes, native) - AC_CHECK_LIB(pthread, main) - - ARCH_CFLAGS="$ARCH_CFLAGS -D_REENTRANT" - - dnl we changed ARCH_CFLAGS, set CFLAGS again - CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS" - - dnl tell boehm to support threads as well - ac_configure_args="$ac_configure_args --enable-boehm-threads=posix" - ;; - -*) - AC_MSG_ERROR($enable_threads is an unknown thread package) - ;; -esac - - -dnl Check whether the compiler supports the __thread keyword. -if test "x$use__thread" != xno; then - AC_CACHE_CHECK([for __thread], ac_cv_gcc___thread, - [cat > conftest.c <<\EOF -__thread int a = 42; -EOF - if AC_TRY_COMMAND([${CC-cc} $ARCH_CFLAGS $OPT_CFLAGS -c conftest.c >&AS_MESSAGE_LOG_FD]); then - ac_cv_gcc___thread=yes - else - ac_cv_gcc___thread=no - fi - rm -f conftest*]) - if test "$ac_cv_gcc___thread" = yes; then - AC_DEFINE([HAVE___THREAD], 1, [have __thread]) - fi -else - ac_cv_gcc___thread=no -fi +AC_CHECK_ENABLE_THREADS dnl check if if-conversion should be supported @@ -851,80 +836,11 @@ AC_DEFINE_UNQUOTED([CACAO_VM_ZIP], "${CACAO_VM_ZIP}", [CACAO's vm.zip]) AC_SUBST(CACAO_VM_ZIP) -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=,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=,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}", [Java core library installation directory]) -AC_SUBST(CLASSPATH_PREFIX) - - -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 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 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=,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}", [Java core library native libraries installation directory]) -AC_SUBST(CLASSPATH_LIBDIR) - - -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=,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", [Java core library jni.h header])], - [AC_MSG_ERROR(cannot find jni.h)]) +AC_CHECK_WITH_CLASSPATH +AC_CHECK_WITH_CLASSPATH_PREFIX +AC_CHECK_WITH_CLASSPATH_CLASSES +AC_CHECK_WITH_CLASSPATH_LIBDIR +AC_CHECK_WITH_CLASSPATH_INCLUDEDIR dnl if we compile for a JRE-style directory layout @@ -985,6 +901,8 @@ AC_CONFIG_FILES([Makefile] [contrib/Makefile] [contrib/setenvinstalled] [contrib/setenvsource] + [contrib/vmlog/Makefile] + [contrib/vmlog/t/Makefile] [doc/Makefile] [doc/handbook/Makefile] [man/Makefile] @@ -1024,9 +942,12 @@ AC_CONFIG_FILES([Makefile] [src/vm/jit/intrp/Makefile] [src/vm/jit/inline/Makefile] [src/vm/jit/loop/Makefile] + [src/vm/jit/m68k/Makefile] + [src/vm/jit/m68k/linux/Makefile] [src/vm/jit/mips/Makefile] [src/vm/jit/mips/irix/Makefile] [src/vm/jit/mips/linux/Makefile] + [src/vm/jit/mips/uclinux/Makefile] [src/vm/jit/optimizing/Makefile] [src/vm/jit/parisc/Makefile] [src/vm/jit/parisc/linux/Makefile]