X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=7fe231168a3ca119817ff9f5c3336cac8d34be6a;hb=6caff2b90f4f5fd1bccf1f217ab70a0f7461ad82;hp=d29902fdfedfb1e5f492a524b0d1ca961705d929;hpb=4f55818331a18fee0050c282f909d113d3370744;p=cacao.git

diff --git a/configure.ac b/configure.ac
index d29902fdf..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.
@@ -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.
 
@@ -660,6 +684,8 @@ AZ_PYTHON_LSPEC
 
 AC_CHECK_ENABLE_GCC_PR40134
 
+AC_CHECK_ENABLE_PIC_ASM
+
 dnl Define version numbers.
 AC_VERSION_DETAIL
 AC_VERSION_CONFIG