2009-05-04 Zoltan Varga <vargaz@gmail.com>
[mono.git] / configure.in
index df7dd232cd4f7faf1992823410e38fe7fc354eed..c8e9d88265d2aa32189a7b36779dcb8474e5bd92 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,2.3)
+AM_INIT_AUTOMAKE(mono,2.5)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -64,10 +64,13 @@ need_link_unlink=no
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
 has_dtrace=no
+parallel_mark=yes
 case "$host" in
        *-*-mingw*|*-*-cygwin*)
                platform_win32=yes
                AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
+               AC_DEFINE(DISABLE_PORTABILITY,1,[Disable the io-portability layer])
+               AC_DEFINE(PLATFORM_NO_SYMLINKS,1,[This platform does not support symlinks])
                if test "x$cross_compiling" = "xno"; then
                        CC="gcc -mno-cygwin -g"
                        # So libgc configure gets -mno-cygwin
@@ -97,6 +100,7 @@ case "$host" in
                libdl="-ldl"
                libgc_threads=pthreads
                with_sigaltstack=no
+               use_sigposix=yes
                ;;
        *-*-*freebsd*)
                platform_win32=no
@@ -119,15 +123,17 @@ case "$host" in
                AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
                libdl=
                libgc_threads=pthreads
-               with_sigaltstack=yes
+               # This doesn't seem to work as of 7.0 on amd64
+               with_sigaltstack=no
 # TLS is only partially implemented on -CURRENT (compiler support
 # but NOT library support)
 #
                with_tls=pthread
+               use_sigposix=yes
                ;;
        *-*-*openbsd*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
+               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD"
                libmono_cflags="-D_THREAD_SAFE"
                LDFLAGS="$LDFLAGS -pthread"
                libmono_ldflags="-pthread"
@@ -135,6 +141,7 @@ case "$host" in
                AC_DEFINE(PTHREAD_POINTER_ID)
                libdl=
                libgc_threads=pthreads
+               use_sigposix=yes
                ;;
        *-*-linux*)
                platform_win32=no
@@ -144,9 +151,10 @@ case "$host" in
                libdl="-ldl"
                libgc_threads=pthreads
                AOT_SUPPORTED="yes"
+               use_sigposix=yes
                ;;
        *-*-hpux*)
-        platform_win32=no
+               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
@@ -162,6 +170,7 @@ case "$host" in
                libmono_ldflags="-lpthread"
                libgc_threads=pthreads
                need_link_unlink=yes
+               use_sigposix=yes
                ;;
        *-*-solaris*)
                platform_win32=no
@@ -172,9 +181,12 @@ case "$host" in
                # This doesn't seem to work on solaris/x86, but the configure test runs
                with_tls=pthread
                has_dtrace=yes
+               use_sigposix=yes
                ;;
        *-*-darwin*)
+               parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
                platform_win32=no
+               platform_darwin=yes
                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"
@@ -205,9 +217,13 @@ fi
 
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
+AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
+AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
+# Disabled for now to fix the windows build
+#AC_PROG_CXX
 AM_PROG_AS
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
@@ -266,7 +282,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 sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
-AC_CHECK_HEADERS(sys/user.h sys/ipc.h sys/sem.h alloca.h ucontext.h)
+AC_CHECK_HEADERS(sys/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 if test x$have_zlib = xyes; then
@@ -320,7 +336,7 @@ AC_CHECK_SIZEOF(void *, 4)
 
 WARN=''
 if test x"$GCC" = xyes; then
-        WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
+        WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings'
                # The runtime code does not respect ANSI C strict aliasing rules
                CFLAGS="$CFLAGS -fno-strict-aliasing"
 
@@ -358,13 +374,19 @@ 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])
+AC_ARG_ENABLE(solaris-tar-check,
+[  --disable-solaris-tar-check    disable solaris tar check],
+   do_solaris_tar_check=no, do_solaris_tar_check=yes)
+
+if test x"$do_solaris_tar_check" = xyes; then
+       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
 fi
 
 mcs_topdir='$(top_srcdir)/'$mcsdir
@@ -391,8 +413,16 @@ fi
 # we do not configure the full gettext, as we consume it dynamically from C#
 AM_PO_SUBDIRS
 
+if test "x$USE_NLS" = "xyes"; then
+   AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no)
+
+   if test "x$HAVE_MSGFMT" = "xno"; then
+         AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.])
+   fi
+fi
+
 AC_ARG_WITH([libgdiplus], 
-       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
+       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to installed)], 
        [], [with_libgdiplus=installed])
 
 case $with_libgdiplus in
@@ -409,7 +439,7 @@ if test "x$PKG_CONFIG" = "xno"; then
 fi
 
 pkg_config_path=
-AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir],
+AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir],
        if test x$with_crosspkgdir = "x"; then
                if test -s $PKG_CONFIG_PATH; then
                        pkg_config_path=$PKG_CONFIG_PATH
@@ -422,7 +452,7 @@ AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir],
 )
 
 AC_ARG_WITH([glib],
-       [  --with-glib=embedded|system       Choose glib API: system or embedded (default to system)],
+       [  --with-glib=embedded|system    Choose glib API: system or embedded (default to system)],
        [], [with_glib=system])
 
 eglib_dir=
@@ -451,7 +481,7 @@ system)
   fi
   
   ## Versions of dependencies
-  GLIB_REQUIRED_VERSION=1.3.11
+  GLIB_REQUIRED_VERSION=2.4.0
   
   PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
   
@@ -494,17 +524,17 @@ if test x$cross_compiling$platform_win32 = xnoyes; then
    AC_MSG_RESULT(ok)
 fi
 
-AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
+AC_ARG_WITH(gc, [  --with-gc=boehm,included,none  Defaults to included],[gc=$with_gc],[gc=$gc_default])
 
 # Enable support for fast thread-local storage
 # Some systems have broken support, so we allow to disable it.
-AC_ARG_WITH(tls, [  --with-tls=__thread,pthread       select Thread Local Storage implementation],[],[with_tls=__thread])
+AC_ARG_WITH(tls, [  --with-tls=__thread,pthread    select Thread Local Storage implementation (defaults to __thread)],[],[with_tls=__thread])
 
 # 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=yes])
+AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack (defaults to yes)],[],[with_sigaltstack=yes])
 
-AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster)],[],[with_static_mono=yes])
+AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster) (defaults to yes)],[],[with_static_mono=yes])
 
 if test "x$enable_static" = "xno"; then
    with_static_mono=no
@@ -518,7 +548,7 @@ fi
 AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
 AC_ARG_ENABLE(mcs-build, [  --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes)
 
-AC_ARG_WITH(xen_opt,   [  --with-xen_opt=yes,no      Enable Xen-specific behaviour],[],[with_xen_opt=yes])
+AC_ARG_WITH(xen_opt,   [  --with-xen_opt=yes,no          Enable Xen-specific behaviour (defaults to yes)],[],[with_xen_opt=yes])
 if test "x$with_xen_opt" = "xyes"; then
        AC_DEFINE(MONO_XEN_OPT, 1, [Xen-specific behaviour])
        ORIG_CFLAGS=$CFLAGS
@@ -536,13 +566,13 @@ if test "x$with_xen_opt" = "xyes"; then
        ])
 fi
 
-AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build], enable_quiet_build=$enableval, enable_quiet_build=yes)
+AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build (on by default)], 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, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd.],
+     LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
+     reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd.],
 [
        for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
                eval "mono_feature_disable_$feature='yes'"
@@ -630,7 +660,7 @@ AC_TRY_COMPILE([], [
    AC_MSG_RESULT(no)
 ])
 
-AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking])
+AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
 if test x$enable_parallel_mark = xyes; then
        libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
 fi
@@ -716,7 +746,7 @@ case "x$gc" in
                ;;
 esac
 
-AC_ARG_WITH(large-heap, [  --with-large-heap=yes,no    Enable support for GC heaps larger than 3GB], [large_heap=$withval], [large_heap=no])
+AC_ARG_WITH(large-heap, [  --with-large-heap=yes,no       Enable support for GC heaps larger than 3GB (defaults to no)], [large_heap=$withval], [large_heap=no])
 if test "x$large_heap" = "xyes"; then
    echo "FOO"
    CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
@@ -775,7 +805,7 @@ if test x$platform_win32 = xno; then
        dnl ******************************************************************
        dnl *** Checks for the IKVM JNI interface library                  ***
        dnl ******************************************************************
-       AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no  build the IKVM JNI interface library],[with_ikvm_native=$withval],[with_ikvm_native=yes])
+       AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no      build the IKVM JNI interface library (defaults to yes)],[with_ikvm_native=$withval],[with_ikvm_native=yes])
 
        ikvm_native_dir=
        if test x$with_ikvm_native = xyes; then
@@ -1351,6 +1381,7 @@ if test x$platform_win32 = xno; then
        AC_CHECK_HEADERS(net/if.h)
        AC_MSG_CHECKING(for ifreq)
        AC_TRY_COMPILE([
+               #include <stdio.h>
                #include <sys/ioctl.h>
                #include <net/if.h>
                ], [
@@ -1405,9 +1436,12 @@ if test x$platform_win32 = xno; then
        AC_CHECK_HEADERS(sys/extattr.h)
        AC_CHECK_HEADERS(sys/sendfile.h)
        AC_CHECK_HEADERS(sys/statvfs.h)
+       AC_CHECK_HEADERS(sys/statfs.h)
        AC_CHECK_HEADERS(sys/vfstab.h)
        AC_CHECK_HEADERS(sys/xattr.h)
        AC_CHECK_HEADERS(sys/mman.h)
+       AC_CHECK_HEADERS(sys/param.h)
+       AC_CHECK_HEADERS(sys/mount.h)
        AC_CHECK_FUNCS(getdomainname)
        AC_CHECK_FUNCS(setdomainname)
        AC_CHECK_FUNCS(fgetgrent)
@@ -1583,14 +1617,18 @@ if test "x$ac_cv_truncl" != "xyes"; then
    AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"])
 fi
 
+AC_CHECK_FUNCS(round)
+AC_CHECK_FUNCS(rint)
+
 dnl ****************************
 dnl *** Look for /dev/random ***
 dnl ****************************
 
 AC_MSG_CHECKING([if usage of random device is requested])
 AC_ARG_ENABLE(dev-random,
-[  --disable-dev-random    disable the use of the random device],
+[  --disable-dev-random    disable the use of the random device (enabled by default)],
 try_dev_random=$enableval, try_dev_random=yes)
+
 AC_MSG_RESULT($try_dev_random)
 
 case "{$target}" in
@@ -1663,11 +1701,11 @@ if test x$gc = xsgen; then
    fi
 fi
 
-AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests      Run the nunit tests of the class library on 'make check'])
+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_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])
@@ -1734,6 +1772,30 @@ fi
 AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
 AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
 
+dnl **************
+dnl ***  LLVM  ***
+dnl **************
+
+AC_ARG_ENABLE(llvm,[  --enable-llvm    Enable the experimental LLVM back-end], enable_llvm=$enableval, enable_llvm=no)
+
+if test "x$enable_llvm" = "xyes"; then
+   AC_PATH_PROG(LLVM_CONFIG, llvm-config, no)
+   if test "x$LLVM_CONFIG" = "xno"; then
+         AC_MSG_ERROR([llvm-config not found.])
+   fi
+
+   LLVM_CXXFLAGS=`$LLVM_CONFIG --cflags`
+   LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+   LLVM_LIBS=`$LLVM_CONFIG --libs core engine`
+   LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
+
+   AC_SUBST(LLVM_CXXFLAGS)
+   AC_SUBST(LLVM_LIBS)
+   AC_DEFINE(ENABLE_LLVM, 1, [Enable the LLVM back end])
+fi
+
+AM_CONDITIONAL(ENABLE_LLVM, [test x$enable_llvm = xyes])
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
@@ -1745,6 +1807,8 @@ SQLITE="libsqlite.so.0"
 SQLITE3="libsqlite3.so.0"
 X11="libX11.so"
 
+sizeof_register="SIZEOF_VOID_P"
+
 jit_wanted=false
 interp_wanted=false
 case "$host" in
@@ -1758,6 +1822,20 @@ case "$host" in
                ACCESS_UNALIGNED="no"
                JIT_SUPPORTED=yes
                jit_wanted=true
+
+               AC_MSG_CHECKING(for mips n32)
+               AC_TRY_COMPILE([], [
+               void main () {
+               #if _MIPS_SIM != _ABIN32
+               #error Not mips n32
+               #endif
+               }
+               ],[
+               AC_MSG_RESULT(yes)
+               sizeof_register=8
+               ],[
+               AC_MSG_RESULT(no)
+               ])
                ;;
        i*86-*-*)
                TARGET=X86;
@@ -1867,7 +1945,7 @@ case "$host" in
                if test "x$ac_cv_sizeof_void_p" = "x8"; then
                        TARGET=POWERPC64;
                        CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
-                       CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
+                       CFLAGS="$CFLAGS -mminimal-toc"
                else
                        TARGET=POWERPC;
                        CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
@@ -1913,11 +1991,32 @@ case "$host" in
                ;;
 esac
 
+# FIXME: Define the others as well
+case "$TARGET" in
+X86)
+       AC_DEFINE(TARGET_X86, 1, [...])
+       ;;
+AMD64)
+       AC_DEFINE(TARGET_AMD64, 1, [...])
+       ;;
+ARM)
+       AC_DEFINE(TARGET_ARM, 1, [...])
+       ;;
+esac
+
+if test "x$sizeof_register" = "x4"; then
+   AC_DEFINE(SIZEOF_REGISTER,4,[size of machine integer registers])
+elif test "x$sizeof_register" = "x8"; then
+   AC_DEFINE(SIZEOF_REGISTER,8,[size of machine integer registers])
+else
+   AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of machine integer registers])
+fi
+
 if test "x$have_visibility_hidden" = "xyes"; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
 fi
 
-AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that default to the JIT],[
+AC_ARG_WITH(jit, [  --with-jit=yes,no              If you want to build scripts that default to the JIT (defaults to no)],[
        if test x$withval = xyes; then
           jit_wanted=true
        else
@@ -1925,7 +2024,7 @@ AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that de
        fi
 ])
 
-AC_ARG_WITH(interp, [  --with-interp=yes,no    If you want to build scripts that default to the interpreter],[
+AC_ARG_WITH(interp, [  --with-interp=yes,no           If you want to build scripts that default to the interpreter (defaults to no)],[
        if test x$withval = xyes; then
           interp_wanted=true
        else
@@ -2094,45 +2193,57 @@ case "x$gc" in
                ;;
 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
-             PREVIEW=no
+PROFILE2=yes
+AC_ARG_WITH(profile2,  [  --with-profile2=yes,no          If you want to install the 2.0 FX (defaults to yes)],[
+       if test x$with_profile2 = xno; then
+             PROFILE2=no
        fi
 ])
 
 MOONLIGHT=yes
-AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonlight 2.1 assemblies],[
+AC_ARG_WITH(moonlight,[  --with-moonlight=yes,no        If you want to build the Moonlight 2.1 assemblies (defaults to yes)],[
        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)],[
+AC_ARG_WITH(oprofile,[  --with-oprofile=no,<oprofile install dir>   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])
+           oprofile_include=$with_oprofile/include
+           if test ! -f $oprofile_include/opagent.h; then
+                 AC_MSG_ERROR([oprofile include file not found at $oprofile_include/opagent.h])
+               fi
+           OPROFILE=yes
+               OPROFILE_CFLAGS="-I$oprofile_include"
+           OPROFILE_LIBS="-L$with_oprofile/lib/oprofile -lopagent"
+           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)],[
+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
 ])
 
+
+DISABLE_MCS_DOCS=no
+AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the documentation under mcs (defaults to yes)],[
+       if test x$with_mcs_docs != xyes; then
+               DISABLE_MCS_DOCS=yes
+       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_0, test x$PROFILE2 = xyes)
 AM_CONDITIONAL(INSTALL_2_1, test x$MOONLIGHT = xyes)
 
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
@@ -2265,8 +2376,8 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
 ],[LN_S='$LN_S'])
 
 if test x$enable_quiet_build = xyes; then
-   AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do $srcdir/scripts/patch-quiet.sh $i; done], [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])
+   AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [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; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
 fi
 
 AC_OUTPUT([
@@ -2280,7 +2391,6 @@ mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
 mono/arch/Makefile
-mono/os/Makefile
 mono/arch/x86/Makefile
 mono/arch/amd64/Makefile
 mono/arch/hppa/Makefile
@@ -2323,11 +2433,14 @@ data/mono-nunit.pc
 data/mono-options.pc
 data/mono-lineeditor.pc
 data/monodoc.pc
+data/mono.web.pc
 data/dotnet.pc
 data/dotnet35.pc
 data/wcf.pc
 data/cecil.pc
-data/smcs.pc
+data/system.web.extensions_1.0.pc
+data/system.web.extensions.design_1.0.pc
+data/system.web.mvc.pc
 samples/Makefile
 support/Makefile
 data/config
@@ -2390,6 +2503,10 @@ fi
     echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
   fi
 
+  if test x$platform_darwin = xyes; then
+       echo "PLATFORM = darwin" >> $srcdir/$mcsdir/build/config.make
+  fi
+
   if test x$TARGET = xAMD64 -a x$platform_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then
         echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make
   fi
@@ -2411,6 +2528,10 @@ fi
       fi
     fi
   fi
+
+  if test x$DISABLE_MCS_DOCS = xyes; then
+       echo "DISABLE_MCS_DOCS = yes" >> $srcdir/$mcsdir/build/config.make
+  fi
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
@@ -2419,18 +2540,20 @@ echo "
         mcs source:    $mcs_topdir
         olive source:  $olive_topdir
 
-       GC:          $gc
-       TLS:         $with_tls
-       SIGALTSTACK: $with_sigaltstack
-       Engine:      $jit_status
-       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
+       GC:            $gc
+       TLS:           $with_tls
+       SIGALTSTACK:   $with_sigaltstack
+       Engine:        $jit_status
+       2.0 Profile:   $PROFILE2
+       2.1 Alpha:     $MOONLIGHT
+       JNI support:   $jdk_headers_found
+       libgdiplus:    $libgdiplus_msg
+       zlib:          $zlib_msg
+       oprofile:      $OPROFILE
+       BigArrays:     $enable_big_arrays
+       DTrace:        $enable_dtrace
+       Parallel Mark: $enable_parallel_mark
+       LLVM Back End: $enable_llvm
        $disabled
 
 "
@@ -2446,3 +2569,9 @@ if test x$gc = xsgen; then
        echo IMPORTANT:
        echo IMPORTANT: There are known problems with it, use at your own risk.
 fi
+
+if test x$enable_llvm = xyes; then
+   echo IMPORTANT:
+   echo IMPORTANT: The LLVM Back End is experimental and does not work yet.
+   echo IMPORTANT:
+fi