X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=b1b3b4b9fb504e7d524c6353ae1d89fce4114056;hb=b2b79df36de909cdaffaf7d5a1cc0f9184ef22a2;hp=d9c69efe6b7e59bf64762407f9f01512fe7d5190;hpb=53230986efab6415c969f944852cc089f6b35e50;p=mono.git

diff --git a/configure.in b/configure.in
index d9c69efe6b7..b1b3b4b9fb5 100644
--- a/configure.in
+++ b/configure.in
@@ -607,6 +607,11 @@ case "x$gc" in
 	xincluded)
 		AC_CONFIG_SUBDIRS(libgc)
 
+		# Pass CPPFLAGS to libgc configure
+		# Maybe we should use a separate variable for this to avoid passing useless and
+		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+		export CPPFLAGS
+
 		found_boehm=yes
 		gc_headers=yes
 		use_included_gc=yes
@@ -628,15 +633,15 @@ case "x$gc" in
 		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		;;
+	xsgen)
+		found_boehm=no
+		gc_headers=no
+		use_included_gc=no
+		AC_DEFINE(HAVE_SGEN_GC,1,[Using the simple generational GC.])
+		AC_DEFINE(HAVE_MOVING_COLLECTOR,1,[The GC can move objects.])
+		AC_DEFINE(HAVE_WRITE_BARRIERS,1,[The GC needs write barriers.])
+		AC_DEFINE_UNQUOTED(USED_GC_NAME, "Simple generational", [GC description])
+		;;
 
 	xnone)
 		AC_MSG_WARN("Compiling mono without GC.")
@@ -1762,9 +1767,8 @@ AM_CONDITIONAL(MONO_DEBUGGER_SUPPORTED, test x$mono_debugger_supported = xyes)
 
 if test "x$with_tls" = "x__thread"; then
 	AC_DEFINE(HAVE_KW_THREAD)
-   # Pass the information to libgc
+	# Pass the information to libgc
 	CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS"
-	export CPPFLAGS
 	AC_MSG_CHECKING(if the tls_model attribute is supported)
 	AC_TRY_COMPILE([static __thread int foo __attribute__((tls_model("initial-exec")));], [
 		], [
@@ -1892,6 +1896,20 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
     cd $depth
 ],[LN_S='$LN_S'])
 
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
+    cd runtime/etc/mono/2.0
+    rm -f web.config
+    $LN_S $reldir/data/net_2_0/web.config web.config
+    cd $depth
+],[LN_S='$LN_S'])
+
 AC_OUTPUT([
 Makefile
 mint.pc
@@ -1922,6 +1940,12 @@ mono/arch/ia64/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config
+mono/tests/cas/Makefile
+mono/tests/cas/assembly/Makefile
+mono/tests/cas/demand/Makefile
+mono/tests/cas/inheritance/Makefile
+mono/tests/cas/linkdemand/Makefile
+mono/tests/cas/threads/Makefile
 mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
@@ -2008,3 +2032,11 @@ echo "
 	$disabled
 
 "
+if test x$gc = xsgen; then
+        echo IMPORTANT:
+	echo IMPORTANT: You have selected an experimental, work-in-progress 
+	echo IMPORTANT: GC engine.  This GC engine is currently not supported
+	echo IMPORTANT: and is not yet ready for use.  
+	echo IMPORTANT:
+	echo IMPORTANT: There are known problems with it, use at your own risk.
+fi