X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=ac9717d2a3155ac15c88aa3f674cf3615eb1ed7d;hb=5b558abeeb255a3179d4ca6a85617e051c6abd38;hp=58caf5ef32e433c7f86c65fd5c2689234e377758;hpb=816f10975ca2bd6badcc669fadc1b431258e1963;p=mono.git diff --git a/configure.in b/configure.in index 58caf5ef32e..ac9717d2a31 100644 --- a/configure.in +++ b/configure.in @@ -86,7 +86,7 @@ case "$host" in host_win32=yes if test "x$cross_compiling" = "xno"; then target_win32=yes - if test "x$host" == "x$target"; then + if test "x$host" == "x$build"; then AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32]) fi CC="gcc -mno-cygwin -g" @@ -94,6 +94,7 @@ case "$host" in # So libgc configure gets -mno-cygwin export CC export CXX + CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -mno-cygwin" else target_win32=yes AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32/MinGW]) @@ -195,6 +196,7 @@ case "$host" in use_sigposix=yes ikvm_native=no AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support]) + AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support]) ;; *-*-hpux*) host_win32=no @@ -377,15 +379,15 @@ AC_CHECK_HEADERS(sys/user.h, [], [], AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no]) if test x$have_zlib = xyes; then AC_TRY_COMPILE([#include ], [ - void main () { #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230) - } + return 0; #else #error No good zlib found #endif ],[ AC_MSG_RESULT(Using system zlib) zlib_msg="system zlib" + AC_DEFINE(HAVE_SYS_ZLIB,1,[Have system zlib]) ],[ AC_MSG_RESULT(Using embedded zlib) have_zlib=no @@ -589,27 +591,6 @@ AC_SUBST(GMODULE_LIBS) AC_SUBST(BUILD_GLIB_CFLAGS) AC_SUBST(BUILD_GLIB_LIBS) -if test x$cross_compiling$host_win32 = xnoyes; then - AC_MSG_CHECKING(for cygwin glib2-dev package) - if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then - AC_MSG_RESULT(found) - AC_MSG_ERROR([Mono cannot be built with the cygwin glib2-devel package installed, because that package doesn't work with -mno-cygwin. Please uninstall it then re-run configure.]) - else - AC_MSG_RESULT(not found, ok) - fi - - AC_MSG_CHECKING(for broken gwin32.h) - glib_include=`$PKG_CONFIG --cflags-only-I glib-2.0 | sed -e 's/ -I.*//g' | sed -e 's/-I//g'` - if test -f $glib_include/glib/gwin32.h; then - if [ grep ftruncate $glib_include/glib/gwin32.h | grep -q define ]; then - AC_MSG_RESULT(failed) - hashmark='#' - AC_MSG_ERROR([Your version of gwin32.h is broken and will cause compilation errors when building mono. Please fix it by deleting the line: '$hashmark define ftruncate...' from '$glib_include/glib/gwin32.h' then re-run configure.]) - fi - fi - AC_MSG_RESULT(ok) -fi - AC_ARG_WITH(gc, [ --with-gc=boehm,included,none Controls the Boehm GC config, default=included],[gc=$with_gc],[gc=$gc_default]) # Enable support for fast thread-local storage @@ -631,6 +612,10 @@ if test "x$enable_shared" = "xno"; then with_shared_mono=no fi +case $host in +*nacl* ) with_shared_mono=yes;; +esac + if test "x$host_win32" = "xyes"; then # Boehm GC requires the runtime to be in its own dll with_static_mono=no @@ -1004,9 +989,11 @@ if test x$target_win32 = xno; then AC_CHECK_FUNCS(getpriority) AC_CHECK_FUNCS(setpriority) AC_CHECK_FUNCS(dl_iterate_phdr) + AC_CHECK_FUNCS(dladdr) AC_CHECK_FUNCS(sysconf) AC_CHECK_FUNCS(sched_setaffinity) + AC_CHECK_FUNCS(sched_getcpu) dnl **************************************************************** dnl *** Check for sched_setaffinity from glibc versions before *** @@ -1842,6 +1829,7 @@ fi AC_CHECK_FUNCS(round) AC_CHECK_FUNCS(rint) +AC_CHECK_FUNCS(execvp) dnl **************************** dnl *** Look for /dev/random *** @@ -1854,7 +1842,7 @@ try_dev_random=$enableval, try_dev_random=yes) AC_MSG_RESULT($try_dev_random) -case "{$target}" in +case "{$build}" in *-openbsd*) NAME_DEV_RANDOM="/dev/srandom" ;; @@ -1997,6 +1985,7 @@ dnl *** NaCl *** dnl ************** AC_ARG_ENABLE(nacl_codegen, [ --enable-nacl-codegen Enable Native Client code generation], enable_nacl_codegen=$enableval, enable_nacl_codegen=no) +AC_ARG_ENABLE(nacl_gc, [ --enable-nacl-gc Enable Native Client garbage collection], enable_nacl_gc=$enableval, enable_nacl_gc=no) AM_CONDITIONAL(NACL_CODEGEN, test x$enable_nacl_codegen != xno) if test "x$enable_nacl_codegen" = "xyes"; then @@ -2005,6 +1994,10 @@ if test "x$enable_nacl_codegen" = "xyes"; then AC_DEFINE(TARGET_NACL, 1, [...]) else MONO_NACL_ALIGN_MASK_OFF=0 + CPPFLAGS="$CPPFLAGS -D__default_codegen__" +fi +if test "x$enable_nacl_gc" = "xyes"; then + CPPFLAGS="$CPPFLAGS -finstrument-for-thread-suspension -D__native_client_gc__" fi AC_SUBST(MONO_NACL_ALIGN_MASK_OFF) @@ -2012,7 +2005,7 @@ dnl ************** dnl *** LLVM *** dnl ************** -AC_ARG_ENABLE(llvm,[ --enable-llvm Enable the experimental LLVM back-end], enable_llvm=$enableval, enable_llvm=no) +AC_ARG_ENABLE(llvm,[ --enable-llvm Enable the LLVM back-end], enable_llvm=$enableval, enable_llvm=no) AC_ARG_ENABLE(loadedllvm,[ --enable-loadedllvm Load the LLVM back-end dynamically], enable_llvm=$enableval && enable_loadedllvm=$enableval, enable_loadedllvm=no) if test "x$enable_llvm" = "xyes"; then @@ -2138,7 +2131,7 @@ case "$host" in sgen_supported=true AOT_SUPPORTED="yes" ;; - darwin*|openbsd*) + darwin*|openbsd*|freebsd*) sgen_supported=true ;; esac @@ -2153,10 +2146,16 @@ case "$host" in sgen_supported=true AOT_SUPPORTED="yes" ;; - darwin*|openbsd*) + darwin*|openbsd*|freebsd*) sgen_supported=true ;; esac + case "$host" in + x86_64-*-nacl*) + AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers]) + sizeof_register=8 + ;; + esac ;; ia64-*-*) TARGET=IA64 @@ -2308,6 +2307,14 @@ if test "x$host" != "x$target"; then sizeof_register=8 target_byte_order=G_BIG_ENDIAN ;; + x86_64-*-nacl) + TARGET=AMD64 + arch_target=amd64 + AC_DEFINE(TARGET_AMD64, 1, [...]) + AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) + AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers]) + sizeof_register=8 + ;; *) AC_MSG_WARN([Cross compiling is only supported for targets matching 'powerpc64-{ps3,xbox360}-linux-gnu']) esac @@ -2360,8 +2367,13 @@ fi dnl dnl Simple Generational checks (sgen) dnl +if $sgen_supported; then + build_sgen_default=yes +else + build_sgen_default=no +fi SGEN_DEFINES= -AC_ARG_WITH(sgen, [ --with-sgen=yes,no Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=yes]) +AC_ARG_WITH(sgen, [ --with-sgen=yes,no Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=$build_sgen_default]) if test x$buildsgen = xyes; then if $sgen_supported; then SGEN_DEFINES="-DHAVE_SGEN_GC -DHAVE_MOVING_COLLECTOR -DHAVE_WRITE_BARRIERS" @@ -2560,6 +2572,10 @@ case "x$gc" in 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 + # Don't pass -finstrument-for-thread-suspension in, + # if these are instrumented it will be very bad news + # (infinite recursion, undefined parking behavior, etc) + LIBGC_CPPFLAGS=`echo $LIBGC_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'` 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) ;; @@ -2605,11 +2621,17 @@ fi MOONLIGHT_DEFINES= AC_ARG_WITH(moonlight, [ --with-moonlight=yes|no|only If you want to build Mono for Moonlight (defaults to no)],[ - MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING" + if test x$with_moonlight != xno; then + MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING " + fi ], [with_moonlight=no]) AC_SUBST(MOONLIGHT_DEFINES) - +AC_ARG_WITH(moon_gc, [ --with-moon-gc=boehm,sgen Select the gc to use with Moonlight (defaults to boehm)],[ + if test "x$with_moon_gc" != "xsgen"; then + with_moon_gc=boehm + fi +], [with_moon_gc=boehm]) AC_CHECK_HEADER([malloc.h], [AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], @@ -2637,6 +2659,9 @@ libmono_ldflags="$libmono_ldflags $LIBS" AM_CONDITIONAL(MOONLIGHT, [test "x$with_moonlight" != "xno"]) AM_CONDITIONAL(ONLY_MOONLIGHT, [test "x$with_moonlight" = "xonly"]) +AM_CONDITIONAL(MOONLIGHT_BOEHM, [test "x$with_moon_gc" = "xboehm"]) +AM_CONDITIONAL(MOONLIGHT_SGEN, [test "x$with_moon_gc" = "xsgen"]) + AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes]) AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" = xyes]) AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes]) @@ -2989,7 +3014,7 @@ echo " LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) Libraries: - Moon Profile: $with_moonlight + Moon Profile: $with_moonlight ($with_moon_gc) MonoDroid: $with_monodroid MonoTouch: $with_monotouch JNI support: $jdk_headers_found