2006-04-26 Alexander Olk <alex.olk@googlemail.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 232bcfbdcf5a60dcb4ccd3d9285ca0e5b8773f69..00647466e244c0ef4dd1eb9b9044ab368bdf44c4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.13)
+AM_INIT_AUTOMAKE(mono,1.1.15)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -593,6 +593,9 @@ case "x$gc" in
                AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
                if test "x$found_gcj_malloc" = "xyes"; then
                        AC_DEFINE(HAVE_GC_GCJ_MALLOC)
+                       AC_DEFINE_UNQUOTED(USED_GC_NAME, "System Boehm (with typed GC)", [GC description])
+               else
+                       AC_DEFINE_UNQUOTED(USED_GC_NAME, "System Boehm (no typed GC)", [GC description])
                fi
                AC_CHECK_LIB(gc, GC_enable, found_gc_enable="yes",,$libdl)
                if test "x$found_gc_enable" = "xyes"; then
@@ -621,10 +624,23 @@ case "x$gc" in
                # The included libgc contains GCJ support
                AC_DEFINE(HAVE_GC_GCJ_MALLOC)
                AC_DEFINE(HAVE_GC_ENABLE)
+               AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC)", [GC description])
                ;;
 
+dnl    xsgen)
+dnl            found_boehm=no
+dnl            gc_headers=no
+dnl            use_included_gc=no
+dnl            AC_DEFINE(HAVE_SGEN_GC,1,[Using the simple generational GC.])
+dnl            AC_DEFINE(HAVE_MOVING_COLLECTOR,1,[The GC can move objects.])
+dnl            AC_DEFINE(HAVE_WRITE_BARRIERS,1,[The GC needs write barriers.])
+dnl            AC_DEFINE_UNQUOTED(USED_GC_NAME, "Simple generational", [GC description])
+dnl            ;;
+
        xnone)
                AC_MSG_WARN("Compiling mono without GC.")
+               AC_DEFINE_UNQUOTED(USED_GC_NAME, "none", [GC description])
+               AC_DEFINE(HAVE_NULL_GC,1,[No GC support.])
                ;;
        *)
                AC_MSG_ERROR([Invalid argument to --with-gc.])
@@ -1531,7 +1547,11 @@ case "$host" in
                esac
                jit_wanted=true
                if test x"$GCC" = xyes; then
-                       CFLAGS="$CFLAGS -Wno-cast-align"
+                       # We don't support v8 cpus
+                       CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9"
+               fi
+               if test x"$AR" = xfalse; then
+                       AC_MSG_ERROR([The required utility 'ar' is not found in your PATH. Usually it can be found in /usr/ccs/bin.])
                fi
                ;;
        alpha*-*-linux* | alpha*-*-osf*)
@@ -1887,7 +1907,6 @@ mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/io-layer/Makefile
 mono/mini/Makefile
-mono/handles/Makefile
 mono/profiler/Makefile
 ikvm-native/Makefile
 scripts/Makefile