X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=1eec8efcf93c6a6adf825cf7afe6c8a9c90fa1d3;hb=03349a3953e0f217d686d88b99fa176509a27559;hp=d33d8591ad43cda403ced9218b323ead3f02af3f;hpb=735bdda890a385d1fa9cc532faadbbc96f2d1218;p=cacao.git diff --git a/configure.ac b/configure.ac index d33d8591a..1eec8efcf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl configure.ac dnl -dnl Copyright (C) 1996-2005, 2006, 2007, 2008 +dnl Copyright (C) 1996-2010 dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO dnl dnl This file is part of CACAO. @@ -23,7 +23,7 @@ dnl 02110-1301, USA. dnl Process this file with autoconf to produce a configure script. -AC_INIT(cacao, 1.1.0pre, cacao@cacaojvm.org) +AC_INIT(cacao, 1.1.0pre2, cacao@cacaojvm.org) AC_CONFIG_SRCDIR(src/cacao/cacao.cpp) AC_CONFIG_AUX_DIR([.]) AC_CANONICAL_HOST @@ -44,7 +44,7 @@ alpha | alphaev56 | alphapca56 ) JAVA_ARCH="alpha" ;; -arm | armv4* | armv5* | armv6* ) +arm | armv4* | armv5* | armv6* | armv7* ) ARCH_DIR="arm" ARCH_FLAGS="-D__ARM__" JAVA_ARCH="arm" @@ -134,7 +134,7 @@ case "$host_os" in *darwin* ) OS_DIR="darwin" - OS_FLAGS="-D__DARWIN__" + OS_FLAGS="-D__DARWIN__ -D_XOPEN_SOURCE=600 -D_DARWIN_C_SOURCE" INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS" ;; @@ -196,16 +196,18 @@ esac dnl Set optimization and debugging for all architectures and systems. dnl NOTE: Setting the CFLAGS/CXXFLAGS only works before calling AC_PROG_CC/AC_PROG_CXX. if test x"$CFLAGS" = "x"; then - OPT_CFLAGS="-g -O0" + OPT_CFLAGS="-g -O2" else OPT_CFLAGS=$CFLAGS fi +OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing" if test x"$CXXFLAGS" = "x"; then - OPT_CXXFLAGS="-g -O0" + OPT_CXXFLAGS="-g -O2" else OPT_CXXFLAGS=$CXXFLAGS fi +OPT_CXXFLAGS="$OPT_CXXFLAGS -fno-strict-aliasing" dnl Check for compiler. AC_PROG_CC @@ -276,6 +278,7 @@ AC_CHECK_HEADERS([errno.h]) AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_HEADERS([fcntl.h]) AC_CHECK_HEADERS([libgen.h]) +AC_CHECK_HEADERS([locale.h]) AC_CHECK_HEADERS([netdb.h]) AC_CHECK_HEADERS([signal.h]) AC_CHECK_HEADERS([stdarg.h]) @@ -338,6 +341,7 @@ AC_CHECK_FUNCS([fclose]) AC_CHECK_FUNCS([fflush]) AC_CHECK_FUNCS([fopen]) AC_CHECK_FUNCS([fprintf]) +AC_CHECK_FUNCS([vfprintf]) AC_CHECK_FUNCS([fread]) AC_CHECK_FUNCS([free]) AC_CHECK_FUNCS([fstat]) @@ -375,6 +379,7 @@ AC_CHECK_FUNCS([recv]) AC_CHECK_FUNCS([scandir]) AC_CHECK_FUNCS([select]) AC_CHECK_FUNCS([send]) +AC_CHECK_FUNCS([setlocale]) AC_CHECK_FUNCS([setsockopt]) AC_CHECK_FUNCS([shutdown]) AC_CHECK_FUNCS([socket]) @@ -392,6 +397,7 @@ AC_CHECK_FUNCS([strstr]) AC_CHECK_FUNCS([time]) AC_CHECK_FUNCS([write]) +AM_LC_MESSAGES dnl Checks for libraries. @@ -577,6 +583,7 @@ AC_CHECK_ENABLE_ASSERTION dnl This one depends on AC_CHECK_ENABLE_ZLIB. AC_CHECK_WITH_VM_ZIP +AC_CHECK_WITH_HGREV AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY @@ -655,6 +662,10 @@ AZ_PYTHON_VERSION_ENSURE( [2.4] ) AZ_PYTHON_CSPEC AZ_PYTHON_LSPEC +AC_CHECK_ENABLE_GCC_PR40134 + +AC_CHECK_ENABLE_PIC_ASM + dnl Define version numbers. AC_VERSION_DETAIL AC_VERSION_CONFIG @@ -689,7 +700,6 @@ AC_CONFIG_FILES([Makefile] [src/mm/Makefile] [src/mm/cacao-gc/Makefile] [src/native/Makefile] - [src/native/include/Makefile] [src/native/jvmti/Makefile] [src/native/vm/Makefile] [src/native/vm/cldc1.1/Makefile]