X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=c2517382fb1fcbc4ea57b10d3f9925a89a0f4e90;hb=c26b399fcb128416e9f29cf5a6b381707224cf6c;hp=a77de96a342f9570d777fa4201b89b742b13b3b9;hpb=4a1db2acd59f9ea6a3affb1b3240382d549eb49a;p=mono.git

diff --git a/configure.in b/configure.in
index a77de96a342..c2517382fb1 100644
--- 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.2)
+AM_INIT_AUTOMAKE(mono,2.1)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -36,6 +36,11 @@ else
   gc_default=boehm
 fi
 
+# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
+# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
+CPPFLAGS_FOR_LIBGC=$CPPFLAGS
+CFLAGS_FOR_LIBGC=$CFLAGS
+
 #
 # These are the flags that need to be stored in the mono.pc file for 
 # compiling code that will embed Mono
@@ -49,7 +54,6 @@ AC_SUBST(libmono_ldflags)
 reloc_libdir=`basename ${libdir}`
 AC_SUBST(reloc_libdir)
 
-
 dnl if linker handles the version script
 no_version_script=no
 
@@ -59,6 +63,7 @@ need_link_unlink=no
 # Thread configuration inspired by sleepycat's db
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
+has_dtrace=no
 case "$host" in
 	*-*-mingw*|*-*-cygwin*)
 		platform_win32=yes
@@ -69,9 +74,10 @@ case "$host" in
 			export CC
 		fi
 		HOST_CC="gcc"
-		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024"
-		libmono_cflags="-mno-cygwin"
-		libmono_ldflags="-mno-cygwin"
+		# Windows 2000 is required that includes Internet Explorer 5.01
+		CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
+		libmono_cflags="-mno-cygwin -mms-bitfields -mwindows"
+		libmono_ldflags="-mno-cygwin -mms-bitfields -mwindows"
 		libdl=
 		libgc_threads=win32
 		gc_default=included
@@ -82,69 +88,17 @@ case "$host" in
 		;;
 	*-*-*netbsd*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+		CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
 		libmono_cflags="-D_REENTRANT"
 		LDFLAGS="$LDFLAGS -pthread"
 		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
 		libmono_ldflags="-pthread"
 		need_link_unlink=yes
-		libdl=
-		libgc_threads=no
-		;;
-# these flags will work for all versions of -STABLE
-#
-	*-*-*freebsd4*)
-		platform_win32=no
-		if test "x$PTHREAD_CFLAGS" = "x"; then
-			CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
-			libmono_cflags="-D_THREAD_SAFE"
-		else
-			CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
-			libmono_cflags="$PTHREAD_CFLAGS"
-		fi
-		if test "x$PTHREAD_LIBS" = "x"; then
-			LDFLAGS="$LDFLAGS -pthread"
-			libmono_ldflags="-pthread"
-		else
-			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-			libmono_ldflags="$PTHREAD_LIBS"
-		fi
-		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD4"
-		need_link_unlink=yes
-		AC_DEFINE(PTHREAD_POINTER_ID)
-		libdl=
-		libgc_threads=pthreads
-# TLS isn't implemented at all on 4-STABLE
-		with_tls=pthread
-		;;
-	*-*-*freebsd5*)
-		platform_win32=no
-		if test "x$PTHREAD_CFLAGS" = "x"; then
-			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-			libmono_cflags=
-		else
-			CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
-			libmono_cflags="$PTHREAD_CFLAGS"
-		fi
-		if test "x$PTHREAD_LIBS" = "x"; then
-			LDFLAGS="$LDFLAGS -pthread"
-			libmono_ldflags="-pthread"
-		else
-			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-			libmono_ldflags="$PTHREAD_LIBS"
-		fi
-		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD5"
-		need_link_unlink=yes
-		AC_DEFINE(PTHREAD_POINTER_ID)
-		libdl=
-		with_sigaltstack=yes
+		libdl="-ldl"
 		libgc_threads=pthreads
-# TLS is only partially implemented on 5-STABLE (compiler support
-# but NOT library support)
-#
-		with_tls=pthread
+		with_sigaltstack=no
 		;;
-	*-*-*freebsd6*)
+	*-*-*freebsd*)
 		platform_win32=no
 		if test "x$PTHREAD_CFLAGS" = "x"; then
 			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
@@ -160,9 +114,9 @@ case "$host" in
 			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 			libmono_ldflags="$PTHREAD_LIBS"
 		fi
-		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6"
+		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
 		need_link_unlink=yes
-		AC_DEFINE(PTHREAD_POINTER_ID)
+		AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
 		libdl=
 		libgc_threads=pthreads
 		with_sigaltstack=yes
@@ -193,6 +147,14 @@ case "$host" in
 	*-*-hpux*)
         platform_win32=no
 		CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
+		# +ESdbgasm only valid on bundled cc on RISC
+		# silently ignored for ia64
+		if test $GCC != "yes"; then
+			CFLAGS="$CFLAGS +ESdbgasm"
+			# Arrange for run-time dereferencing of null
+			# pointers to produce a SIGSEGV signal.
+			LDFLAGS="$LDFLAGS -z"
+		fi
 		CFLAGS="$CFLAGS +ESdbgasm"
 		LDFLAGS="$LDFLAGS -z"
 		libmono_cflags="-D_REENTRANT"
@@ -202,25 +164,31 @@ case "$host" in
 		;;
 	*-*-solaris*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP"
+		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DPLATFORM_SOLARIS"
 		need_link_unlink=yes
 		libmono_cflags="-D_REENTRANT"
 		libgc_threads=pthreads
 		# This doesn't seem to work on solaris/x86, but the configure test runs
 		with_tls=pthread
+		has_dtrace=yes
 		;;
 	*-*-darwin*)
 		platform_win32=no
 		CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
+		CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
 		libmono_cflags="-D_THREAD_SAFE"
 		LDFLAGS="$LDFLAGS -pthread"
 		libmono_ldflags="-pthread"
 		need_link_unlink=yes
 		AC_DEFINE(PTHREAD_POINTER_ID)
-		AC_DEFINE(USE_MACH_SEMA)
+		AC_DEFINE(USE_MACH_SEMA, 1, [...])
 		no_version_script=yes
 		libdl=
 		libgc_threads=pthreads
+		has_dtrace=yes
+		if test "x$cross_compiling" = "xyes"; then
+			has_broken_apple_cpp=yes
+		fi
 		;;
 	*)
 		AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -235,9 +203,11 @@ if test x$need_link_unlink = xyes; then
 fi
 
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
+AM_PROG_AS
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_AWK
@@ -271,6 +241,7 @@ AC_SUBST(HOST_CC)
 AC_SUBST(BUILD_EXEEXT)
 
 AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
+AM_CONDITIONAL(USE_BATCH_FILES, [test x$platform_win32 = xyes -a x$cross_compiling = xyes])
 
 # Set STDC_HEADERS
 AC_HEADER_STDC
@@ -278,6 +249,11 @@ AC_LIBTOOL_WIN32_DLL
 # This causes monodis to not link correctly
 #AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
+# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
+DOLT
+
+export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+AC_SUBST(export_ldflags)
 
 # Test whenever ld supports -version-script
 AC_PROG_LD
@@ -288,11 +264,29 @@ fi
 
 AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
+if test x$have_zlib = xyes; then
+   AC_TRY_COMPILE([#include <zlib.h>], [
+   void main () {
+   #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
+   }
+   #else
+   #error No good zlib found
+   #endif
+   ],[
+	AC_MSG_RESULT(Using system zlib)
+	zlib_msg="system zlib"
+   ],[
+	AC_MSG_RESULT(Using embedded zlib)
+	have_zlib=no
+	zlib_msg="bundled zlib"
+   ])
+fi
 
 AM_CONDITIONAL(HAVE_ZLIB, test x$have_zlib = xyes)
+AC_DEFINE(HAVE_ZLIB,1,[Have system zlib])
 
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
@@ -306,17 +300,7 @@ AC_CHECK_HEADERS(syslog.h)
 
 # for mono/dis
 AC_CHECK_HEADERS(wchar.h)
-case "$host" in
-	*-*-*freebsd6*)
-		AC_CHECK_HEADERS(ieeefp.h)
-	;;
-	*-*-*freebsd*)
-		/* Only freebsd6 has a working ieeefp.h */
-	;;
-	*)
-		AC_CHECK_HEADERS(ieeefp.h)
-	;;
-esac
+AC_CHECK_HEADERS(ieeefp.h)
 AC_MSG_CHECKING(for isinf)
 AC_TRY_LINK([#include <math.h>], [
 	int f = isinf (1);
@@ -359,6 +343,7 @@ else
 	esac
 fi
 CFLAGS="$CFLAGS -g $WARN"
+CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
 
 # Where's the 'mcs' source tree?
 if test -d $srcdir/mcs; then
@@ -367,6 +352,19 @@ else
   mcsdir=../mcs
 fi
 
+#
+# A sanity check to catch cases where the package was unpacked
+# with an ancient tar program (Solaris)
+#
+AC_MSG_CHECKING(integrity of package)
+if test -f $srcdir/$mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+then
+   AC_MSG_RESULT(ok)
+else
+   errorm="Your mono distribution is incomplete;  if unpacking from a tar file, make sure you use GNU tar;  see http://www.mono-project.com/IncompletePackage for more details"
+   AC_MSG_ERROR([$errorm])
+fi
+
 mcs_topdir='$(top_srcdir)/'$mcsdir
 mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir
 
@@ -376,6 +374,21 @@ AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_bui
 AC_SUBST([mcs_topdir])
 AC_SUBST([mcs_topdir_from_srcdir])
 
+# Where's the 'olive' source tree?
+if test -d $srcdir/olive; then
+  olivedir=olive
+else
+  olivedir=../olive
+fi
+
+if test -d $srcdir/$olivedir; then
+olive_topdir='$(top_srcdir)/'$olivedir
+fi
+
+# gettext: prepare the translation directories. 
+# we do not configure the full gettext, as we consume it dynamically from C#
+AM_PO_SUBDIRS
+
 AC_ARG_WITH([libgdiplus], 
 	[  --with-libgdiplus=installed|sibling|<path>	Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
 	[], [with_libgdiplus=installed])
@@ -410,18 +423,31 @@ AC_ARG_WITH([glib],
 	[  --with-glib=embedded|system       Choose glib API: system or embedded (default to system)],
 	[], [with_glib=system])
 
+eglib_dir=
+
 case $with_glib in
 embedded) 
-  GLIB_CFLAGS='-I$(top_srcdir)/eglib/src'
+  GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
   GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
   BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
   BUILD_GLIB_LIBS="$GLIB_LIBS"
+  GMODULE_CFLAGS="$GLIB_CFLAGS"
+  GMODULE_LIBS="$GLIB_LIBS"
+  eglib_dir=eglib
   AC_CONFIG_SUBDIRS(eglib)
   ;;
 system)
+  if test "x$cross_compiling" = "xyes"; then
+    pkg_config_path="$PKG_CONFIG_PATH"
+    unset PKG_CONFIG_PATH
+  fi
   BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
   BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
-
+  if test "x$cross_compiling" = "xyes"; then
+    PKG_CONFIG_PATH=$pkg_config_path
+    export PKG_CONFIG_PATH
+  fi
+  
   ## Versions of dependencies
   GLIB_REQUIRED_VERSION=1.3.11
   
@@ -443,6 +469,7 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 AC_SUBST(BUILD_GLIB_CFLAGS)
 AC_SUBST(BUILD_GLIB_LIBS)
+AC_SUBST(eglib_dir)
 
 if test x$cross_compiling$platform_win32 = xnoyes; then
    AC_MSG_CHECKING(for cygwin glib2-dev package)
@@ -473,7 +500,7 @@ AC_ARG_WITH(tls, [  --with-tls=__thread,pthread       select Thread Local Storag
 
 # Enable support for using sigaltstack for SIGSEGV and stack overflow handling
 # This does not work on some platforms (bug #55253)
-AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=no])
+AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=yes])
 
 AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster)],[],[with_static_mono=yes])
 
@@ -499,17 +526,21 @@ if test "x$with_xen_opt" = "xyes"; then
 					   void main () { }
 	], [
 	   AC_MSG_RESULT(yes)
+	   # Pass it to libgc as well
+	   CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
 	], [
 	   AC_MSG_RESULT(no)
 	   CFLAGS=$ORIG_CFLAGS
 	])
 fi
 
+AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build], enable_quiet_build=$enableval, enable_quiet_build=yes)
+
 DISABLED_FEATURES=none
 
 AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
   LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
-  reflection_emit, large_code, logging, com, ssa, generics.],
+  reflection_emit, large_code, logging, com, ssa, generics, attach, jit.],
 [
 	for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
 		eval "mono_feature_disable_$feature='yes'"
@@ -528,6 +559,7 @@ fi
 if test "x$mono_feature_disable_profiler" = "xyes"; then
 	AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
 fi
+AM_CONDITIONAL(DISABLE_PROFILER, test x$mono_feature_disable_profiler = xyes)
 
 if test "x$mono_feature_disable_decimal" = "xyes"; then
 	AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
@@ -565,6 +597,16 @@ if test "x$mono_feature_disable_generics" = "xyes"; then
 	AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support])
 fi
 
+if test "x$mono_feature_disable_attach" = "xyes"; then
+	AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
+fi
+
+if test "x$mono_feature_disable_jit" = "xyes"; then
+	AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.])
+fi
+
+AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes)
+
 AC_MSG_CHECKING(for visibility __attribute__)
 AC_TRY_COMPILE([], [
    void __attribute__ ((visibility ("hidden"))) doit (void) {}
@@ -577,6 +619,11 @@ AC_TRY_COMPILE([], [
    AC_MSG_RESULT(no)
 ])
 
+AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking])
+if test x$enable_parallel_mark = xyes; then
+	libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
+fi
+
 LIBGC_CFLAGS=
 LIBGC_LIBS=
 LIBGC_STATIC_LIBS=
@@ -593,7 +640,7 @@ case "x$gc" in
 			AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.")
 		fi
 
-		AC_DEFINE(HAVE_BOEHM_GC)
+		AC_DEFINE(HAVE_BOEHM_GC, 1, [Have Boehm GC])
 		AC_SUBST(HAVE_BOEHM_GC)
 		LIBGC_LIBS="-lgc $libdl"
 		LIBGC_STATIC_LIBS="$LIBGC_LIBS"
@@ -601,25 +648,18 @@ case "x$gc" in
 		# AC_CHECK_FUNCS does not work for some reason...
 		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(HAVE_GC_GCJ_MALLOC, 1, [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
-			AC_DEFINE(HAVE_GC_ENABLE)
+			AC_DEFINE(HAVE_GC_ENABLE, 1, [Have 'GC_enable'])
 		fi
 		;;
 
 	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
@@ -629,16 +669,20 @@ case "x$gc" in
 		LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
 		LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
 
-		AC_DEFINE(HAVE_BOEHM_GC)
+		AC_DEFINE(HAVE_BOEHM_GC, 1, [Have Boehm GC])
 		AC_SUBST(HAVE_BOEHM_GC)
 
-		AC_DEFINE(HAVE_GC_H)
-		AC_DEFINE(USE_INCLUDED_LIBGC)
+		AC_DEFINE(HAVE_GC_H, 1, [Have gc.h])
+		AC_DEFINE(USE_INCLUDED_LIBGC, 1, [Use included libgc])
 
 		# 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])
+		AC_DEFINE(HAVE_GC_GCJ_MALLOC, 1, [Have GC_gcj_malloc])
+		AC_DEFINE(HAVE_GC_ENABLE, 1, [Have GC_enable])
+		if test x$enable_parallel_mark = xyes; then
+			AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description])
+		else
+			AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC)", [GC description])
+		fi
 		;;
 
 	xsgen)
@@ -667,9 +711,6 @@ if test "x$large_heap" = "xyes"; then
    CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
 fi
 
-# tell libgc/configure about what we want
-ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
-
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
 AC_SUBST(LIBGC_CFLAGS)
 AC_SUBST(LIBGC_LIBS)
@@ -682,6 +723,9 @@ dnl
 
 if test x$platform_win32 = xno; then
 
+	dnl hires monotonic clock support
+	AC_SEARCH_LIBS(clock_gettime, rt)
+
 	dnl dynamic loader support
 	AC_CHECK_FUNC(dlopen, DL_LIB="",
 		AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no)
@@ -743,6 +787,11 @@ if test x$platform_win32 = xno; then
 	AC_CHECK_FUNCS(mkstemp)
 	AC_CHECK_FUNCS(mmap)
 	AC_CHECK_FUNCS(madvise)
+	AC_CHECK_FUNCS(getrusage)
+	AC_CHECK_FUNCS(getpriority)
+	AC_CHECK_FUNCS(setpriority)
+
+	AC_CHECK_FUNCS(sched_setaffinity)
 
 	dnl ******************************************************************
 	dnl *** Check for large file support                               ***
@@ -772,7 +821,7 @@ if test x$platform_win32 = xno; then
 			}
 		], [
 			AC_MSG_RESULT(ok)
-			AC_DEFINE(HAVE_LARGE_FILE_SUPPORT)
+			AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
 			large_CPPFLAGS="$large_CPPFLAGS $1"
 			large_offt=yes
 		], [
@@ -805,7 +854,7 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_MSG_NOSIGNAL)
+		AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, [Have MSG_NOSIGNAL])
 	], [
 		# We'll have to use signals
 		AC_MSG_RESULT(no)
@@ -820,7 +869,7 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SOL_IP)
+		AC_DEFINE(HAVE_SOL_IP, 1, [Have SOL_IP])
 	], [
 		# We'll have to use getprotobyname
 		AC_MSG_RESULT(no)
@@ -835,7 +884,7 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SOL_IPV6)
+		AC_DEFINE(HAVE_SOL_IPV6, 1, [Have SOL_IPV6])
 	], [
 		# We'll have to use getprotobyname
 		AC_MSG_RESULT(no)
@@ -850,7 +899,7 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SOL_TCP)
+		AC_DEFINE(HAVE_SOL_TCP, 1, [Have SOL_TCP])
 	], [
 		# We'll have to use getprotobyname
 		AC_MSG_RESULT(no)
@@ -865,26 +914,54 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IP_PKTINFO)
+		AC_DEFINE(HAVE_IP_PKTINFO, 1, [Have IP_PKTINFO])
 	], [
 		AC_MSG_RESULT(no)
 	])
 
 	dnl *****************************
-    dnl *** Checks for IPV6_PKTINFO ***
-    dnl *****************************
-    AC_MSG_CHECKING(for IPV6_PKTINFO)
-    AC_TRY_COMPILE([#include <netdb.h>], [
-        int level = IPV6_PKTINFO;
-    ], [
-        # Yes, we have it...
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_IPV6_PKTINFO)
-    ], [
-        AC_MSG_RESULT(no)
-    ])
- 
-	dnl *********************************
+	dnl *** Checks for IPV6_PKTINFO ***
+	dnl *****************************
+	AC_MSG_CHECKING(for IPV6_PKTINFO)
+	AC_TRY_COMPILE([#include <netdb.h>], [
+		int level = IPV6_PKTINFO;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_IPV6_PKTINFO, 1, [Have IPV6_PKTINFO])
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+	dnl **********************************
+	dnl *** Checks for IP_DONTFRAGMENT ***
+	dnl **********************************
+	AC_MSG_CHECKING(for IP_DONTFRAGMENT)
+	AC_TRY_COMPILE([#include <netdb.h>], [
+		int level = IP_DONTFRAGMENT;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_IP_DONTFRAGMENT, 1, [Have IP_DONTFRAGMENT])
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+	dnl **********************************
+	dnl *** Checks for IP_MTU_DISCOVER ***
+	dnl **********************************
+	AC_MSG_CHECKING(for IP_MTU_DISCOVER)
+	AC_TRY_COMPILE([#include <netdb.h>], [
+		int level = IP_MTU_DISCOVER;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_IP_MTU_DISCOVER, 1, [Have IP_MTU_DISCOVER])
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+ 	dnl *********************************
 	dnl *** Check for struct ip_mreqn ***
 	dnl *********************************
 	AC_MSG_CHECKING(for struct ip_mreqn)
@@ -894,7 +971,7 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_STRUCT_IP_MREQN)
+		AC_DEFINE(HAVE_STRUCT_IP_MREQN, 1, [Have struct ip_mreqn])
 	], [
 		# We'll just have to try and use struct ip_mreq
 		AC_MSG_RESULT(no)
@@ -905,7 +982,7 @@ if test x$platform_win32 = xno; then
 		], [
 			# Yes, we have it...
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+			AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1, [Have struct ip_mreq])
 		], [
 			# No multicast support
 			AC_MSG_RESULT(no)
@@ -921,7 +998,7 @@ if test x$platform_win32 = xno; then
 	], [
 		# Yes, we have it...
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_GETHOSTBYNAME2_R)
+		AC_DEFINE(HAVE_GETHOSTBYNAME2_R, 1, [Have gethostbyname2_r])
 	], [
 		AC_MSG_RESULT(no)
 	])
@@ -938,7 +1015,7 @@ if test x$platform_win32 = xno; then
 	dnl ***********************************************
 	# AC_CHECK_SIZEOF can't cope with struct members :-(
 	AC_MSG_CHECKING(size of sockaddr_un.sun_path)
-	AC_CACHE_VAL(cv_mono_sizeof_sunpath,
+	AC_CACHE_VAL(mono_cv_sizeof_sunpath,
 		[AC_TRY_RUN([
 			#include <sys/types.h>
 			#include <stdio.h>
@@ -951,11 +1028,11 @@ if test x$platform_win32 = xno; then
 				fprintf(f, "%d\n", sizeof(sock_un.sun_path));
 				exit(0);
 			}
-		], cv_mono_sizeof_sunpath=`cat conftestval`,
-		   cv_mono_sizeof_sunpath=0,
-		   cv_mono_sizeof_sunpath=0)])dnl
-	AC_MSG_RESULT($cv_mono_sizeof_sunpath)
-	AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
+		], mono_cv_sizeof_sunpath=`cat conftestval`,
+		   mono_cv_sizeof_sunpath=0,
+		   mono_cv_sizeof_sunpath=0)])dnl
+	AC_MSG_RESULT($mono_cv_sizeof_sunpath)
+	AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path])
 
 	dnl *************************************
 	dnl *** Checks for zero length arrays ***
@@ -968,10 +1045,10 @@ if test x$platform_win32 = xno; then
                 };
         ], [], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0)
+		AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0, [Length of zero length arrays])
 	], [
 		AC_MSG_RESULT(no)
-		AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1)
+		AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1, [Length of zero length arrays])
 	])
 
 	dnl *****************************
@@ -1003,13 +1080,7 @@ if test x$platform_win32 = xno; then
 # and libpthread does not exist
 #
 	case "${host}" in
-		*-*-*freebsd4*)
-			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
-		;;
-		*-*-*freebsd5*)
-			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
-		;;
-		*-*-*freebsd6*)
+		*-*-*freebsd*)
 			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
 		;;
 		*)
@@ -1028,7 +1099,7 @@ if test x$platform_win32 = xno; then
 	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
-		AC_DEFINE(USE_MONO_MUTEX)
+		AC_DEFINE(USE_MONO_MUTEX, 1, [Use mono_mutex_t])
 	])
 	AC_CHECK_FUNCS(pthread_attr_setstacksize)
 	AC_CHECK_FUNCS(pthread_attr_getstack)
@@ -1172,7 +1243,7 @@ if test x$platform_win32 = xno; then
 
 		], [
 				AC_MSG_RESULT(yes)
-				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK, 1, [Have a working sigaltstack])
 		], [
 				with_sigaltstack=no
 				AC_MSG_RESULT(no)
@@ -1198,7 +1269,7 @@ if test x$platform_win32 = xno; then
 			tm.tm_gmtoff = 1;
 			], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
 	if test $ac_cv_struct_tm_gmtoff = yes; then
-		AC_DEFINE(HAVE_TM_GMTOFF)
+		AC_DEFINE(HAVE_TM_GMTOFF, 1, [Have tm_gmtoff])
 	else
 		AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
 			AC_TRY_COMPILE([
@@ -1207,7 +1278,7 @@ if test x$platform_win32 = xno; then
 				timezone = 1;
 			], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
 		if test $ac_cv_var_timezone = yes; then
-			AC_DEFINE(HAVE_TIMEZONE)
+			AC_DEFINE(HAVE_TIMEZONE, 1, [Have timezone variable])
 		else
 			AC_ERROR(unable to find a way to determine timezone)
 		fi
@@ -1217,15 +1288,17 @@ if test x$platform_win32 = xno; then
 	dnl *** Checks for math functions ***
 	dnl *********************************
         LIBS="$LIBS -lm";
-        AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
-                AC_TRY_LINK([#include <math.h>], 
-                [ finite(0.0); ], 
-                AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
-                AC_MSG_RESULT(no)))
+	if test "x$has_broken_apple_cpp" != "xyes"; then
+	        AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
+	                AC_TRY_LINK([#include <math.h>], 
+	                [ finite(0.0); ], 
+	                AC_DEFINE(HAVE_FINITE, 1, [Have finite]) AC_MSG_RESULT(yes),
+	                AC_MSG_RESULT(no)))
+	fi
         AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h)
                 AC_TRY_LINK([#include <math.h>], 
                 [ isfinite(0.0); ], 
-                AC_DEFINE(HAVE_ISFINITE) AC_MSG_RESULT(yes),
+                AC_DEFINE(HAVE_ISFINITE, 1, [Have isfinite]) AC_MSG_RESULT(yes),
                 AC_MSG_RESULT(no)))
 
 	dnl ****************************************************************
@@ -1242,7 +1315,7 @@ if test x$platform_win32 = xno; then
 		int s = signbit(1.0);
 	], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SIGNBIT)
+		AC_DEFINE(HAVE_SIGNBIT, 1, [Have signbit])
 	], [
 		AC_MSG_RESULT(no)
 	]) 
@@ -1280,6 +1353,36 @@ if test x$platform_win32 = xno; then
 			AC_MSG_RESULT(no)
 		])
 	dnl **********************************
+	dnl ***     Checks for sin_len     ***
+	dnl **********************************
+	AC_MSG_CHECKING(for sockaddr_in.sin_len)
+	AC_TRY_COMPILE([
+		#include <netinet/in.h>
+		], [
+		struct sockaddr_in saddr;
+		saddr.sin_len = sizeof (saddr);
+		],[
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [sockaddr_in has sin_len])
+		], [
+			AC_MSG_RESULT(no)
+		])	
+	dnl **********************************
+	dnl ***    Checks for sin6_len     ***
+	dnl **********************************
+	AC_MSG_CHECKING(for sockaddr_in6.sin6_len)
+	AC_TRY_COMPILE([
+		#include <netinet/in.h>
+		], [
+		struct sockaddr_in6 saddr6;
+		saddr6.sin6_len = sizeof (saddr6);
+		],[
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_SOCKADDR_IN6_SIN_LEN, 1, [sockaddr_in6 has sin6_len])
+		], [
+			AC_MSG_RESULT(no)
+		])	
+	dnl **********************************
 	dnl *** Checks for MonoPosixHelper ***
 	dnl **********************************
 	AC_CHECK_HEADERS(checklist.h)
@@ -1336,6 +1439,9 @@ if test x$platform_win32 = xno; then
 		 #include <utime.h>])
 	AC_CHECK_TYPES([struct timezone], [AC_DEFINE(HAVE_STRUCT_TIMEZONE)], ,
 		[#include <sys/time.h>])
+	AC_CHECK_TYPES([struct utimbuf], [AC_DEFINE(HAVE_STRUCT_UTIMBUF)], ,
+		[#include <sys/types.h>
+		 #include <utime.h>])
 	AC_CHECK_MEMBERS(
 		[struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, 
 		[#include <sys/types.h>
@@ -1347,6 +1453,12 @@ if test x$platform_win32 = xno; then
 	)
 	AC_SUBST(XATTR_LIB)
 
+	dnl *********************************
+	dnl *** Checks for Windows compilation ***
+	dnl *********************************
+	AC_CHECK_HEADERS(sys/time.h)
+	AC_CHECK_HEADERS(sys/param.h)
+
 	dnl *********************************
 	dnl *** Check for Console 2.0 I/O ***
 	dnl *********************************
@@ -1366,7 +1478,10 @@ else
 	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
 	AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
 	AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?))
+	AC_CHECK_LIB(winmm, main, LIBS="$LIBS -lwinmm", AC_ERROR(bad mingw install?))
 	AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?))
+	AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?))
+	AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?))
 
 	dnl *********************************
 	dnl *** Check for struct ip_mreqn ***
@@ -1407,7 +1522,7 @@ AC_TRY_COMPILE([
   socklen_t foo;
 ],[
 ac_cv_c_socklen_t=yes
-	AC_DEFINE(HAVE_SOCKLEN_T)
+	AC_DEFINE(HAVE_SOCKLEN_T, 1, [Have socklen_t])
 	AC_MSG_RESULT(yes)
 ],[
 	AC_MSG_RESULT(no)
@@ -1437,7 +1552,7 @@ AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
 	AC_MSG_RESULT(no)))
 
 if test "x$ac_cv_truncl" != "xyes"; then
-   AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL) LIBS="$LIBS -lsunmath"])
+   AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"])
 fi
 
 dnl ****************************
@@ -1468,7 +1583,7 @@ dnl Everywhere else, it's /dev/random
     ;;
 esac
 
-AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM")
+AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM", [Name of /dev/random])
 
 dnl Now check if the device actually exists
 
@@ -1477,7 +1592,7 @@ if test "x$try_dev_random" = "xyes"; then
     [if test -r "$NAME_DEV_RANDOM" ; then
         ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
     if test "x$ac_cv_have_dev_random" = "xyes"; then
-        AC_DEFINE(HAVE_CRYPT_RNG)
+        AC_DEFINE(HAVE_CRYPT_RNG, 1, [Have /dev/random])
     fi
 else
     AC_MSG_CHECKING(for random device)
@@ -1510,13 +1625,87 @@ AC_MSG_CHECKING([if inter-process shared handles are requested])
 AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
 AC_MSG_RESULT($try_shared_handles)
 if test "x$try_shared_handles" != "xyes"; then
-	AC_DEFINE(DISABLE_SHARED_HANDLES)
+	AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
 	AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
+if test x$gc = xsgen; then
+   if test x$with_tls != x__thread; then
+	  AC_MSG_ERROR([The SGEN garbage collector depends on a working __thread implementation, and either --with-thread=pthread was passed to configure, or the configure test for __thread failed.])
+   fi
+fi
+
 AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests	Run the nunit tests of the class library on 'make check'])
 AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
 
+AC_MSG_CHECKING([if big-arrays are to be enabled])
+AC_ARG_ENABLE(big-arrays,  [ --enable-big-arrays	Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
+if test "x$enable_big_arrays" = "xyes" ; then
+    if  test "x$ac_cv_sizeof_void_p" = "x8"; then
+	AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
+    else
+        AC_MSG_ERROR([The allocation and indexing of arrays greater than Int32.MaxValue is not supported on this platform.])
+    fi
+fi
+AC_MSG_RESULT($enable_big_arrays)
+
+dnl **************
+dnl *** DTRACE ***
+dnl **************
+
+AC_ARG_ENABLE(dtrace,[  --enable-dtrace	Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=$has_dtrace)
+
+if test "x$enable_dtrace" = "xyes"; then
+   if test "x$has_dtrace" = "xno"; then
+   	  AC_MSG_ERROR([DTrace probes are not supported on this platform.])
+   fi
+   AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin])
+   if test "x$DTRACE" = "xno"; then
+   	  AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.])
+	  enable_dtrace=no
+   fi
+fi
+
+dtrace_g=no
+if test "x$enable_dtrace" = "xyes"; then
+	AC_DEFINE(ENABLE_DTRACE, 1, [Enable DTrace probes])
+	DTRACEFLAGS=
+	if test "x$ac_cv_sizeof_void_p" = "x8"; then
+		case "$host" in
+			powerpc-*-darwin*)
+			DTRACEFLAGS="-arch ppc64"
+			;;
+			i*86-*-darwin*)
+			DTRACEFLAGS="-arch x86_64"
+			;;
+			*)
+			DTRACEFLAGS=-64
+			;;
+		esac
+	else
+		case "$host" in
+			powerpc-*-darwin*)
+			DTRACEFLAGS="-arch ppc"
+			;;
+			i*86-*-darwin*)
+			DTRACEFLAGS="-arch i386"
+			;;
+			*)
+			DTRACEFLAGS=-32
+			;;
+		esac
+	fi
+	AC_SUBST(DTRACEFLAGS)
+	case "$host" in
+		*-*-solaris*)
+		dtrace_g=yes
+		;;
+	esac
+	AC_CHECK_HEADERS([sys/sdt.h])
+fi
+AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
+AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
@@ -1551,6 +1740,10 @@ case "$host" in
 		  solaris*)
 			LIBC="libc.so"
 			INTL="libintl.so"
+			if test "x$ac_cv_sizeof_void_p" = "x8"; then
+				TARGET=AMD64
+				arch_target=amd64
+			fi
 
 			# On solaris 10 x86, gcc prints a warning saying 'visibility attribute not supported on this configuration; ignored', but linking fails. A test case:
 			# int astruct __attribute__ ((visibility ("hidden")));
@@ -1564,7 +1757,6 @@ case "$host" in
 			# ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
 			have_visibility_hidden=no
 
-			libmono_ldflags="$libmono_ldflags $LIBS"
 		esac
 		;;
 	x86_64-*-* | amd64-*-*)
@@ -1598,7 +1790,6 @@ case "$host" in
 		  *)
 			LIBC="libc.so"
 			INTL="libintl.so"
-			libmono_ldflags="$libmono_ldflags $LIBS"
 		esac
 		jit_wanted=true
 		if test x"$GCC" = xyes; then
@@ -1615,7 +1806,7 @@ case "$host" in
 		JIT_SUPPORTED=yes
 		jit_wanted=true
 		arch_target=alpha;
-		CFLAGS="$CFLAGS -mieee"
+		CFLAGS="$CFLAGS -mieee -O0"
 		case $host_os in
 		  linux*)
 			LIBC="libc.so.6.1"
@@ -1637,19 +1828,32 @@ case "$host" in
 		;;
 	hppa*linux*)
 		TARGET=HPPA;
+		AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
 		arch_target=hppa; 
 		ACCESS_UNALIGNED="no"
-		INTERP_SUPPORTED=yes
-		interp_wanted=true
+		JIT_SUPPORTED=yes
+		jit_wanted=true
 		;;
-	macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
-        powerpc-*-sysv* | powerpc-*-darwin*)
-		TARGET=POWERPC;
+	macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
+        powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* )
+		if test "x$ac_cv_sizeof_void_p" = "x8"; then
+			TARGET=POWERPC64;
+		else
+			TARGET=POWERPC;
+		fi
 		AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
 		arch_target=ppc;
 		JIT_SUPPORTED=yes
 		jit_wanted=true
 		;;
+	arm*-darwin*)
+		TARGET=ARM;
+		arch_target=arm;
+		ACCESS_UNALIGNED="no"
+		JIT_SUPPORTED=yes
+		CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
+		jit_wanted=true
+		;;
 	arm*-linux*)
 		TARGET=ARM;
 		arch_target=arm;
@@ -1764,10 +1968,7 @@ esac
 
 AC_SUBST(libsuffix)
 
-if test "x$TARGET" != "xAMD64"; then
-   # valgrind headers don't compile under x86-64
-   AC_CHECK_HEADERS(valgrind/memcheck.h)
-fi
+AC_CHECK_HEADERS(valgrind/memcheck.h)
 
 if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
 	if test "x$with_tls" = "x__thread"; then
@@ -1789,7 +1990,7 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
 fi
 
 mono_debugger_supported=no
-if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
+if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA"; then
 	if test x$use_included_gc = xyes; then
 		case "$host" in
 		*-*-*linux*)
@@ -1807,7 +2008,7 @@ AC_MSG_RESULT($mono_debugger_supported)
 AM_CONDITIONAL(MONO_DEBUGGER_SUPPORTED, test x$mono_debugger_supported = xyes)
 
 if test "x$with_tls" = "x__thread"; then
-	AC_DEFINE(HAVE_KW_THREAD)
+	AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword])
 	# Pass the information to libgc
 	CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS"
 	AC_MSG_CHECKING(if the tls_model attribute is supported)
@@ -1820,7 +2021,7 @@ if test "x$with_tls" = "x__thread"; then
 	])
 fi
 
-if test ${TARGET} = ARM; then
+if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
 	dnl ******************************************
 	dnl *** Check to see what FPU is available ***
 	dnl ******************************************
@@ -1828,11 +2029,7 @@ if test ${TARGET} = ARM; then
 
 	AC_TRY_COMPILE([], [
 		__asm__ ("ldfd f0, [r0]");
-		], fpu=FPA, [
-			AC_TRY_COMPILE([], [
-				__asm__ ("fldd d0, [r0]");
-			], fpu=VFP, fpu=NONE)
-		])
+		], fpu=FPA, fpu=NONE)
 
 	AC_MSG_RESULT($fpu)
 	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
@@ -1848,14 +2045,64 @@ if test ${ACCESS_UNALIGNED} = no; then
 	CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
+case "x$gc" in
+	xincluded)
+		# Pass CPPFLAGS to libgc configure
+		# We should use a separate variable for this to avoid passing useless and
+		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+		# This should be executed late so we pick up the final version of CPPFLAGS
+		# The problem with this approach, is that during a reconfigure, the main
+		# configure scripts gets invoked with these arguments, so we use separate
+		# variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
+		LIBGC_CPPFLAGS=$CPPFLAGS
+		if test x$TARGET = xSPARC -o x$TARGET = xSPARC64; then
+			LIBGC_CPPFLAGS=`echo $LIBGC_CPPFLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//g'`
+		fi
+		ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$LIBGC_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
+		AC_CONFIG_SUBDIRS(libgc)
+		;;
+esac
+
 PREVIEW=yes
-AC_ARG_WITH(preview, [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
+AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
 	if test x$with_preview = xno; then
 	      PREVIEW=no
 	fi
 ])
 
+MOONLIGHT=yes
+AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonlight 2.1 assemblies],[
+	if test x$with_moonlight = xno; then
+	      MOONLIGHT=no
+	fi
+])
+
+OPROFILE=no
+AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path>   Enable oprofile support (defaults to NO)],[
+	if test x$with_oprofile != xno; then
+	      OPROFILE=yes
+	      OPROFILE_CFLAGS="-I$with_oprofile/include"
+	      OPROFILE_LIBS=
+	      AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
+	fi
+])
+
+MALLOC_MEMPOOLS=no
+AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no  Use malloc for each single mempool allocation (only for runtime debugging, defaults to NO)],[
+	if test x$with_malloc_mempools = xyes; then
+		MALLOC_MEMPOOLS=yes
+		AC_DEFINE(USE_MALLOC_FOR_MEMPOOLS,1,[Use malloc for each single mempool allocation])
+	fi
+])
+
+AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
+AC_SUBST(OPROFILE_CFLAGS)
+AC_SUBST(OPROFILE_LIBS)
+
+libmono_ldflags="$libmono_ldflags $LIBS"
+
 AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
+AM_CONDITIONAL(INSTALL_2_1, test x$MOONLIGHT = xyes)
 
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
 AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
@@ -1868,6 +2115,7 @@ AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
 AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
+AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 AM_CONDITIONAL(S390, test x$TARGET = xS390)
 AM_CONDITIONAL(S390x, test x$TARGET = xS390x)
@@ -1882,7 +2130,7 @@ AC_SUBST(INTL)
 AC_SUBST(SQLITE)
 AC_SUBST(SQLITE3)
 AC_SUBST(X11)
-
+AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -1900,15 +2148,20 @@ AC_SUBST(mono_runtime)
 
 mono_cfg_root=$mono_build_root/runtime
 if test x$platform_win32 = xyes; then
-  mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
+  if test "x$cross_compiling" = "xno"; then
+    mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
+  else
+    mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\\'`\\etc
+  fi
 else
   mono_cfg_dir=$mono_cfg_root/etc
 fi
 AC_SUBST(mono_cfg_dir)
 
+AC_CONFIG_FILES([po/mcs/Makefile.in])
+
 AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
 AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
-AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper])
 
 AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..
@@ -1952,12 +2205,41 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config],
     cd $depth
 ],[LN_S='$LN_S'])
 
+AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini],
+[   depth=../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/
+    cd runtime/etc/mono/
+    rm -f browscap.ini
+    $LN_S $reldir/data/browscap.ini browscap.ini
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
+    cd runtime/etc/mono/2.0/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
+if test x$enable_quiet_build = xyes; then
+   AC_CONFIG_COMMANDS([quiet], [find mono libgc support -name Makefile -exec $shell $srcdir/scripts/patch-quiet.sh {} \;], [shell=$SHELL])
+   AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
+fi
+
 AC_OUTPUT([
 Makefile
-mint.pc
-mono.pc
-mono-cairo.pc
-dotnet.pc
 mono-uninstalled.pc
 scripts/mono-nunit.pc
 scripts/mono-find-provides
@@ -1983,6 +2265,7 @@ mono/arch/mips/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config
+mono/tests/assemblyresolve/Makefile
 mono/tests/cas/Makefile
 mono/tests/cas/assembly/Makefile
 mono/tests/cas/demand/Makefile
@@ -2003,12 +2286,23 @@ docs/Makefile
 data/Makefile
 data/net_1_1/Makefile
 data/net_2_0/Makefile
+data/net_2_0/Browsers/Makefile
+data/mint.pc
+data/mono.pc
+data/mono-cairo.pc
+data/dotnet.pc
+data/dotnet35.pc
+data/wcf.pc
+data/cecil.pc
+data/smcs.pc
 samples/Makefile
 support/Makefile
 data/config
 tools/Makefile
 tools/locale-builder/Makefile
 runtime/Makefile
+msvc/Makefile
+po/Makefile
 ])
 
 if test x$platform_win32 = xyes; then
@@ -2038,12 +2332,12 @@ fi
   if test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
+    echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
     echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
     echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
-
     case $INSTALL in
     [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
     *) mcs_INSTALL=$mono_build_root/$INSTALL ;;
@@ -2054,24 +2348,52 @@ fi
     export VERSION
     [myver=$($AWK 'BEGIN {
       split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
+      if(length(vsplit [1]) > 4) {
+        split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
+      }
       print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
     }')]
 
     echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
   fi
+
+  # if we have an olive folder, override the default settings
+  if test -d $olivedir; then
+
+    test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build
+
+    if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
+      echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
+      echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
+      echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
+      echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
+	  if test x$with_moonlight = xyes; then
+        echo "WITH_MOONLIGHT = yes" >> $srcdir/$olivedir/build/config.make
+      fi
+    fi
+  fi
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
 
 echo "
-        mcs source:  $mcs_topdir
+        mcs source:    $mcs_topdir
+        olive source:  $olive_topdir
+
 	GC:	     $gc
 	TLS:         $with_tls
 	SIGALTSTACK: $with_sigaltstack
 	Engine:      $jit_status
-	2.0 Alpha:   $PREVIEW
+	2.0 Beta:    $PREVIEW
+	2.1 Alpha:   $MOONLIGHT
 	JNI support: $jdk_headers_found
 	libgdiplus:  $libgdiplus_msg
+	zlib:        $zlib_msg
+	oprofile:    $OPROFILE
+	BigArrays:   $enable_big_arrays
+	DTrace:      $enable_dtrace
 	$disabled
 
 "
@@ -2079,10 +2401,6 @@ if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then
    AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs)
 fi
 
-if test x$have_zlib = xno; then
-   AC_MSG_WARN(ZLib devel files not available, compression file support in 2.0 won't work.)
-fi
-
 if test x$gc = xsgen; then
         echo IMPORTANT:
 	echo IMPORTANT: You have selected an experimental, work-in-progress