X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=blobdiff_plain;f=configure.ac;h=7fe231168a3ca119817ff9f5c3336cac8d34be6a;hp=41853414f0d10090f961bea259247713ae1116c5;hb=HEAD;hpb=b349a2edd2aa540bf444922cc54e9747730c15c2

diff --git a/configure.ac b/configure.ac
index 41853414f..7fe231168 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-2012
 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.0pre1, 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"
     ;;
 
@@ -193,20 +193,40 @@ dnl Must be BEFORE *linux*.
 esac
 
 
+AC_MSG_CHECKING(whether to disable optimizations and build with -g -O0)
+AC_ARG_ENABLE([optimizations],
+              [AS_HELP_STRING(--disable-optimizations,build with -g -O0 [[default=no]])],
+              [case "${enableval}" in
+                   no) disable_optimizations=yes;;
+                   *) disable_optimizations=no;;
+               esac],
+              [disable_optimizations=no])
+AC_MSG_RESULT(${disable_optimizations})
+
 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 -O2"
+    OPT_CFLAGS="-g"
 else
     OPT_CFLAGS=$CFLAGS
 fi
+if test x"${disable_optimizations}" = "xyes"; then
+    OPT_CFLAGS="$OPT_CFLAGS -O0"
+else
+    OPT_CFLAGS="$OPT_CFLAGS -O2"
+fi
 OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing"
 
 if test x"$CXXFLAGS" = "x"; then
-    OPT_CXXFLAGS="-g -O2"
+    OPT_CXXFLAGS="-g"
 else
     OPT_CXXFLAGS=$CXXFLAGS
 fi
+if test x"${disable_optimizations}" = "xyes"; then
+    OPT_CXXFLAGS="$OPT_CXXFLAGS -O0"
+else
+    OPT_CXXFLAGS="$OPT_CXXFLAGS -O2"
+fi
 OPT_CXXFLAGS="$OPT_CXXFLAGS -fno-strict-aliasing"
 
 dnl Check for compiler.
@@ -278,6 +298,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])
@@ -340,6 +361,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])
@@ -377,6 +399,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])
@@ -394,6 +417,7 @@ AC_CHECK_FUNCS([strstr])
 AC_CHECK_FUNCS([time])
 AC_CHECK_FUNCS([write])
 
+AM_LC_MESSAGES
 
 dnl Checks for libraries.
 
@@ -579,6 +603,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
 
@@ -657,6 +682,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