Merge pull request #3121 from lambdageek/dev/managed-init_message

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 96616f87fc23a27e5d698e09a683a338554d1fd8..0cd24ea88df8c4c419f2092bc028b6a33c6bb3a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3262,14 +3262,22 @@ dnl
 dnl Simple Generational checks (sgen)
 dnl
 SGEN_DEFINES=
-AC_ARG_WITH(sgen, [  --with-sgen=yes,no             Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=yes])
+AC_ARG_WITH(sgen,                    [  --with-sgen=yes,no             Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=yes])
+AC_ARG_WITH(sgen-default-concurrent, [  --with-sgen-default-concurrent=yes,no             Use Concurrent GC, default=no],[],[with_sgen_default_concurrent=no])
 if test x$buildsgen = xyes; then
    AC_DEFINE(HAVE_MOVING_COLLECTOR, 1, [Moving collector])
    SGEN_DEFINES="-DHAVE_SGEN_GC"
+
+       conc_gc_msg=""
+   if test x$with_sgen_default_concurrent != xno; then
+       AC_DEFINE(HAVE_CONC_GC_AS_DEFAULT, 1, [Defaults to concurrent GC])
+          conc_gc_msg=" (concurrent by default)"
+   fi
+
    if test "x$gc_msg" = "x"; then
-      gc_msg="sgen"
+      gc_msg="sgen$conc_gc_msg"
    else
-      gc_msg="sgen and $gc_msg"
+      gc_msg="sgen$conc_gc_msg and $gc_msg"
    fi
 fi
 AC_SUBST(SGEN_DEFINES)