X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e7e3cf926abfe9bd5d26bc7a59a27d2cbcc942f5;hb=2774ee3029e42d732b783f084e3eca57b6d8dfad;hp=e63af6082eafb8e6ffbec18765b7016cd2e7bd67;hpb=7a323a934bc482606f2e1ce8fc87539501b7c16f;p=cacao.git

diff --git a/configure.in b/configure.in
index e63af6082..e7e3cf926 100644
--- a/configure.in
+++ b/configure.in
@@ -15,9 +15,8 @@ ASMPART="asmpart.S"
 case "$host_cpu" in
 alpha* )
 	SYSDEP_DIR="alpha"
-	CFLAGS="-ieee -O2 -g3 -D__ALPHA__"
-	COMPILER_OBJECTS="compiler.o"
-	AC_DEFINE(OLD_COMPILER)
+	CFLAGS="-mieee -O0 -g3 -D__ALPHA__"
+	COMPILER_OBJECTS=""
 	AC_DEFINE(TRACE_ARGS_NUM, 6)
 	AC_DEFINE(USE_CODEMMAP)
 	;;
@@ -25,7 +24,7 @@ alpha* )
 mips* )
 	SYSDEP_DIR="mips"
 	ASMPART="asmpart.s"
-        CFLAGS="-64 -g -DMAP_ANONYMOUS=0 -woff 1048,1110,1164,1515 -D__MIPS__"
+        CFLAGS="-64 -O2 -OPT:Olimit=0 -g -DMAP_ANONYMOUS=0 -woff 1110,1164,1515 -D__MIPS__"
 	LIBS="-lelfutil"
 	COMPILER_OBJECTS=""
 	AC_DEFINE(TRACE_ARGS_NUM, 8)
@@ -49,14 +48,14 @@ x86_64* )
 
 powerpc* | ppc* )
 	SYSDEP_DIR="powerpc"
-	CFLAGS="-O0 -g -DMAP_ANONYMOUS=0 -no-cpp-precomp"
+	CFLAGS="-O2 -g -DMAP_ANONYMOUS=0 -no-cpp-precomp"
 	COMPILER_OBJECTS="powerpc/libdisass.a"
 	AC_DEFINE(TRACE_ARGS_NUM, 8)
 	;;
 
 sparc* | * )
-	AC_MSG_ERROR($target systems are not supported at this time) ;;
-
+	AC_MSG_ERROR($host_cpu systems are not supported at this time)
+        ;;
 esac
 
 AC_SUBST(COMPILER_OBJECTS)
@@ -132,7 +131,6 @@ dnl Features
 
 dnl check arguments
 AC_ARG_ENABLE(threads, [  --enable-threads        enable threads support])
-AC_ARG_WITH(gc, [  --with-gc[=ARG]         use garbage collector [gc2,gc1,boehm]])
 
 dnl threads
 AC_MSG_CHECKING(whether to include threads support)
@@ -151,46 +149,22 @@ else
 	AC_SUBST(THREAD_OBJ)
 fi
 
-dnl garbage collector version
-AC_MSG_CHECKING(which garbage collector to use)
-case "$with_gc" in
-boehm )
-	AC_MSG_RESULT(Boehm garbage collector)
-	GC_OBJ="mm/libboehm.a libgc.a"
-	if test ! -e libgc.a; then
-		AC_MSG_ERROR([libgc.a not found, see README.boehm])
-	fi
-	AC_DEFINE(USE_BOEHM)
-	BOEHM_LIB=libboehm.a
-	;;
-gc1 )
-	AC_MSG_RESULT(old garbage collector)
-	GC_OBJ="mm/libmm_old.a"
-	;;
-gc2 | "" )
-	AC_MSG_RESULT(new garbage collector)
-	GC_OBJ="mm/libmm_new.a"
-	;;
-* )
-	AC_MSG_ERROR(Invalid GC)
-	;;
-esac
-AC_SUBST(GC_OBJ)
-AC_SUBST(BOEHM_LIB)
+dnl now configure boehm gc
+AC_CONFIG_SUBDIRS(mm/boehm-gc)
 
 AC_OUTPUT(Makefile \
-	  toolbox/Makefile \
           mm/Makefile \
+	  toolbox/Makefile \
 	  threads/Makefile \
 	  jit/Makefile \
           alpha/Makefile \
           mips/Makefile \
           i386/Makefile \
           x86_64/Makefile \
-		  powerpc/Makefile \
+          powerpc/Makefile \
           nat/Makefile \
           doc/Makefile \
-          comp/Makefile \
 	  narray/Makefile \
 	  tst/Makefile \
+	  tst/kaffe/Makefile \
 	  jvmtst/Makefile )