2008-07-23 Robert Jordan <robertj@gmx.net>
[mono.git] / configure.in
index 90ffc85cf952f9e3ba908ae0addad2e35ad690f5..9b292e776f2f0c8d4a5f7bb71f35374806be4436 100644 (file)
@@ -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.6)
+AM_INIT_AUTOMAKE(mono,2.0)
 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
@@ -70,7 +75,8 @@ case "$host" in
                        export CC
                fi
                HOST_CC="gcc"
-               CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024 -DUNICODE -D_UNICODE"
+               # 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"
                libmono_ldflags="-mno-cygwin"
                libdl=
@@ -113,7 +119,7 @@ case "$host" in
                fi
                CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD4"
                need_link_unlink=yes
-               AC_DEFINE(PTHREAD_POINTER_ID)
+               AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread_t is a pointer])
                libdl=
                libgc_threads=pthreads
 # TLS isn't implemented at all on 4-STABLE
@@ -228,10 +234,13 @@ case "$host" in
                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
+               if test "x$cross_compiling" = "xyes"; then
+                       has_broken_apple_cpp=yes
+               fi
                ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -246,6 +255,7 @@ 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
@@ -290,6 +300,8 @@ 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
 
 # Test whenever ld supports -version-script
 AC_PROG_LD
@@ -300,7 +312,7 @@ 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 sys/mkdev.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
@@ -389,6 +401,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
@@ -397,6 +410,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
 
@@ -451,14 +477,17 @@ 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)
@@ -486,6 +515,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)
@@ -542,12 +572,16 @@ 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.
@@ -636,7 +670,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"
@@ -644,25 +678,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
@@ -672,15 +699,15 @@ 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(HAVE_GC_GCJ_MALLOC, 1, [Have GC_gcj_malloc])
+               AC_DEFINE(HAVE_GC_ENABLE, 1, [Have GC_enable])
                AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC)", [GC description])
                ;;
 
@@ -710,9 +737,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)
@@ -725,6 +749,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)
@@ -820,7 +847,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
                ], [
@@ -853,7 +880,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)
@@ -868,7 +895,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)
@@ -883,7 +910,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)
@@ -898,7 +925,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)
@@ -913,7 +940,7 @@ 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)
        ])
@@ -927,7 +954,7 @@ if test x$platform_win32 = xno; then
        ], [
                # Yes, we have it...
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IPV6_PKTINFO)
+               AC_DEFINE(HAVE_IPV6_PKTINFO, 1, [Have IPV6_PKTINFO])
        ], [
                AC_MSG_RESULT(no)
        ])
@@ -941,7 +968,7 @@ if test x$platform_win32 = xno; then
        ], [
                # Yes, we have it...
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_DONTFRAGMENT)
+               AC_DEFINE(HAVE_IP_DONTFRAGMENT, 1, [Have IP_DONTFRAGMENT])
        ], [
                AC_MSG_RESULT(no)
        ])
@@ -955,7 +982,7 @@ if test x$platform_win32 = xno; then
        ], [
                # Yes, we have it...
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_MTU_DISCOVER)
+               AC_DEFINE(HAVE_IP_MTU_DISCOVER, 1, [Have IP_MTU_DISCOVER])
        ], [
                AC_MSG_RESULT(no)
        ])
@@ -970,7 +997,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)
@@ -981,7 +1008,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)
@@ -997,7 +1024,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)
        ])
@@ -1014,7 +1041,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>
@@ -1027,11 +1054,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 ***
@@ -1044,10 +1071,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 *****************************
@@ -1104,7 +1131,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)
@@ -1248,7 +1275,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)
@@ -1274,7 +1301,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([
@@ -1283,7 +1310,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
@@ -1293,15 +1320,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 ****************************************************************
@@ -1318,7 +1347,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)
        ]) 
@@ -1525,7 +1554,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)
@@ -1555,7 +1584,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 ****************************
@@ -1586,7 +1615,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
 
@@ -1595,7 +1624,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)
@@ -1628,14 +1657,73 @@ 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)
+AC_MSG_RESULT($enable_big_arrays)
+if test "x$enable_big_arrays" = "xyes" ; then
+       AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
+fi
+
+AC_MSG_CHECKING([if DTrace support is requested])
+AC_ARG_ENABLE(dtrace,[  --enable-dtrace        Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=no)
+AC_MSG_RESULT($enable_dtrace)
+dtrace_g=no
+if test "x$enable_dtrace" = "xyes"; then
+       AC_DEFINE(ENABLE_DTRACE, 1, [Enable DTrace probes])
+       AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin])
+       if test "x$DTRACE" = "xno"; then
+               AC_MSG_FAILURE([DTrace requested but not found])
+       fi
+       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"
 
@@ -1766,12 +1854,24 @@ case "$host" in
                ;;
        macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
         powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* )
-               TARGET=POWERPC;
+               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;
@@ -1886,10 +1986,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
@@ -1929,7 +2026,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)
@@ -1942,7 +2039,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 ******************************************
@@ -1966,6 +2063,29 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
+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
+
+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],[
        if test x$with_preview = xno; then
@@ -1980,6 +2100,28 @@ AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonl
        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)
@@ -1996,6 +2138,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)
@@ -2036,7 +2179,6 @@ AC_SUBST(mono_cfg_dir)
 
 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=../../../..
@@ -2094,6 +2236,24 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/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])
+fi
+
 AC_OUTPUT([
 Makefile
 mono-uninstalled.pc
@@ -2142,11 +2302,14 @@ 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/cecil.pc
+data/smcs.pc
 samples/Makefile
 support/Makefile
 data/config
@@ -2189,7 +2352,6 @@ fi
     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 ;;
@@ -2243,6 +2405,8 @@ echo "
        JNI support: $jdk_headers_found
        libgdiplus:  $libgdiplus_msg
        zlib:        $zlib_msg
+       oprofile:    $OPROFILE
+       BigArrays:   $enable_big_arrays
        $disabled
 
 "