X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=ac9717d2a3155ac15c88aa3f674cf3615eb1ed7d;hb=5b558abeeb255a3179d4ca6a85617e051c6abd38;hp=5ed33e6ff0df0d6fe99cb30d37e3e19787ffcf65;hpb=1c4ffb7584d1d340fdebaf4a2265e779b56368d4;p=mono.git

diff --git a/configure.in b/configure.in
index 5ed33e6ff0d..ac9717d2a31 100644
--- a/configure.in
+++ b/configure.in
@@ -2621,11 +2621,17 @@ fi
 
 MOONLIGHT_DEFINES=
 AC_ARG_WITH(moonlight, [  --with-moonlight=yes|no|only         If you want to build Mono for Moonlight (defaults to no)],[
-        MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING"
+	if test x$with_moonlight != xno; then
+        MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING "
+	fi
 ], [with_moonlight=no])
 AC_SUBST(MOONLIGHT_DEFINES)
 
-
+AC_ARG_WITH(moon_gc, [  --with-moon-gc=boehm,sgen		Select the gc to use with Moonlight (defaults to boehm)],[
+	if test "x$with_moon_gc" != "xsgen"; then
+		with_moon_gc=boehm
+	fi
+], [with_moon_gc=boehm])
 
 AC_CHECK_HEADER([malloc.h], 
 		[AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], 
@@ -2653,6 +2659,9 @@ libmono_ldflags="$libmono_ldflags $LIBS"
 
 AM_CONDITIONAL(MOONLIGHT, [test "x$with_moonlight" != "xno"])
 AM_CONDITIONAL(ONLY_MOONLIGHT, [test "x$with_moonlight" = "xonly"])
+AM_CONDITIONAL(MOONLIGHT_BOEHM, [test "x$with_moon_gc" = "xboehm"])
+AM_CONDITIONAL(MOONLIGHT_SGEN, [test "x$with_moon_gc" = "xsgen"])
+
 AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
 AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" = xyes])
 AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes])
@@ -3005,7 +3014,7 @@ echo "
 	LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
 
     Libraries:
-	Moon Profile:  $with_moonlight
+	Moon Profile:  $with_moonlight ($with_moon_gc)
 	MonoDroid:     $with_monodroid
 	MonoTouch:     $with_monotouch
 	JNI support:   $jdk_headers_found