X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e6147def073454ede99a2ba05a7083bfa1105612;hb=c09ac134319d711f7dec376560029c6f6822ef54;hp=27b4b147c0f70408b86b9862dd1b1d8bc9cf7fbf;hpb=bd6f70058eafff90b0292c68bfa32b33cac72bd2;p=mono.git diff --git a/configure.in b/configure.in index 27b4b147c0f..e6147def073 100644 --- a/configure.in +++ b/configure.in @@ -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 @@ -130,7 +133,7 @@ case "$host" in ;; *-*-*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" @@ -181,6 +184,7 @@ case "$host" in 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" @@ -648,7 +652,7 @@ AC_TRY_COMPILE([], [ AC_MSG_RESULT(no) ]) -AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=yes) +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 @@ -1369,6 +1373,7 @@ if test x$platform_win32 = xno; then AC_CHECK_HEADERS(net/if.h) AC_MSG_CHECKING(for ifreq) AC_TRY_COMPILE([ + #include #include #include ], [ @@ -2340,7 +2345,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 @@ -2383,6 +2387,7 @@ 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