X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=8012c62bcb981f01fba54233e616e7c7fe353186;hb=20a42782e9fc05f6d75b03dbb76e5f6e7d303cf8;hp=acca772bfd7589ae64166a5679f39acfa5b9bbe3;hpb=0900c61969ca862b0bcc967b4413e539acf07dbb;p=mono.git diff --git a/configure.in b/configure.in index acca772bfd7..8012c62bcb9 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,2.7) +AM_INIT_AUTOMAKE(mono,2.11) AM_MAINTAINER_MODE API_VER=2.0 @@ -26,6 +26,7 @@ dnl gc_headers=no gc=included +gc_msg="included Boehm" use_included_gc=no libgc_configure_args= @@ -66,6 +67,7 @@ AC_MSG_CHECKING([host platform characteristics]) libgc_threads=no has_dtrace=no parallel_mark=yes +ikvm_native=yes case "$host" in powerpc*-*-linux*) @@ -84,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" @@ -92,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]) @@ -155,7 +158,7 @@ case "$host" in ;; *-*-*openbsd*) host_win32=no - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP" + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_REENTRANT -DUSE_MMAP" if test "x$disable_munmap" != "xyes"; then CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP" fi @@ -178,9 +181,23 @@ case "$host" in libmono_cflags="-D_REENTRANT" libdl="-ldl" libgc_threads=pthreads - AOT_SUPPORTED="yes" use_sigposix=yes ;; + *-*-nacl*) + host_win32=no + CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP" + if test "x$disable_munmap" != "xyes"; then + CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP" + fi + libmono_cflags="-D_REENTRANT" + libdl= + libgc_threads=pthreads + gc_default=boehm + 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 CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT" @@ -231,12 +248,12 @@ case "$host" in if test "x$cross_compiling" = "xyes"; then has_broken_apple_cpp=yes fi - dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin10.0.0, but + dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin*, but dnl its gcc defaults to 64-bit mode. They have also deprecated the usage of ucontext dnl we need to set some flags to build our 32-bit binaries on 10.6 properly case "$host" in - dnl Snow Leopard config.guess reports as this - i*86-*-darwin10*) + dnl Snow Leopard and newer config.guess reports as this + i*86-*-darwin*) BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5" CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS" CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS" @@ -349,7 +366,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 sys/uio.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 sys/uio.h sys/param.h) AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h) AC_CHECK_HEADERS(sys/user.h, [], [], @@ -362,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 @@ -478,6 +495,16 @@ mcs_topdir=$(cd "$srcdir/$mcsdir" && pwd) mcs_topdir_from_srcdir='$(top_builddir)'/$mcsdir fi +# Convert mcs_topdir* paths to Windows syntax. +if test x$cross_compiling$host_win32 = xnoyes; then + mcs_topdir=$(cygpath -m $mcs_topdir) + case $mcs_topdir_from_srcdir in + /cygdrive/*) + mcs_topdir_from_srcdir=$(cygpath -m $mcs_topdir_from_srcdir) + ;; + esac +fi + ## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno]) @@ -519,10 +546,7 @@ yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;; esac AC_SUBST([libgdiplus_loc]) -PKG_PROG_PKG_CONFIG() -if test "x$PKG_CONFIG" = "x"; then - AC_MSG_ERROR([You need to install pkg-config]) -fi +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) pkg_config_path= AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to custom dir], @@ -537,50 +561,15 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan fi ) -AC_ARG_WITH([glib], - [ --with-glib=embedded|system Choose glib API: system or embedded (default to system)], - [], [with_glib=system]) - -eglib_dir= - ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\"" AC_CONFIG_SUBDIRS(eglib) -case $with_glib in -embedded) - 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 - ;; -system) - echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" - echo "cross_compiling=$cross_compiling" - BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` - BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` - - ## Versions of dependencies - GLIB_REQUIRED_VERSION=2.4.0 - - dnl - dnl No, you will not replace this check with a pkg.m4 check - dnl - if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then - GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` - GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` - GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0` - GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0` - else - AC_MSG_ERROR([You need at least glib-2.0 $GLIB_REQUIRED_VERSION]) - fi - ;; -*) - AC_MSG_ERROR([Invalid argument to --with-glib.]) -esac -AM_CONDITIONAL(EGLIB_BUILD, test x$with_glib = xembedded) +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" AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -588,30 +577,8 @@ 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$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 Defaults to included],[gc=$with_gc],[gc=$gc_default]) +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 # Some systems have broken support, so we allow to disable it. @@ -622,17 +589,27 @@ AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage i 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) (defaults to yes)],[],[with_static_mono=yes]) +AC_ARG_WITH(shared_mono, [ --with-shared_mono=yes,no build a shared libmono library (defaults to yes)],[],[with_shared_mono=yes]) if test "x$enable_static" = "xno"; then with_static_mono=no fi +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 fi AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno) +AM_CONDITIONAL(SHARED_MONO, test x$with_shared_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 (defaults to yes)],[],[with_xen_opt=yes]) @@ -661,23 +638,19 @@ if test x$enable_small_config = xyes; then CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DSMALL_CONFIG" fi -if test x$AOT_SUPPORTED != xyes; then - AOT_SUPPORTED=no -fi - -AC_ARG_ENABLE(system-aot, [ --enable-system-aot Enable the Ahead-Of-Time compilation of system assemblies during the build (on by default on some platforms)], enable_system_aot=$enableval, enable_system_aot=$AOT_SUPPORTED) +AC_ARG_ENABLE(system-aot, [ --enable-system-aot Enable the Ahead-Of-Time compilation of system assemblies during the build (on by default on some platforms)], enable_system_aot=$enableval, enable_system_aot=default) 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, soft_debug, normalization.], + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, normalization, assembly_remapping.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do eval "mono_feature_disable_$feature='yes'" done DISABLED_FEATURES=$enable_minimal - disabled="Disabled: $enable_minimal" + disabled="Disabled: $enable_minimal" ],[]) AC_DEFINE_UNQUOTED(DISABLED_FEATURES, "$DISABLED_FEATURES", [String of disabled features]) @@ -791,6 +764,11 @@ if test "x$mono_feature_disable_normalization" = "xyes"; then AC_MSG_NOTICE([Disabled String normalization support.]) fi +if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then + AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.]) + AC_MSG_NOTICE([Disabled Assembly remapping.]) +fi + AC_MSG_CHECKING(for visibility __attribute__) AC_TRY_COMPILE([], [ void __attribute__ ((visibility ("hidden"))) doit (void) {} @@ -822,6 +800,9 @@ if test x$enable_parallel_mark = xyes; then libgc_configure_args="$libgc_configure_args --enable-parallel-mark" fi +dnl +dnl Boehm GC configuration +dnl LIBGC_CFLAGS= LIBGC_LIBS= LIBGC_STATIC_LIBS= @@ -838,29 +819,36 @@ 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, 1, [Have Boehm GC]) - AC_SUBST(HAVE_BOEHM_GC) LIBGC_LIBS="-lgc $libdl" LIBGC_STATIC_LIBS="$LIBGC_LIBS" libmono_ldflags="$libmono_ldflags -lgc" + BOEHM_DEFINES="-DHAVE_BOEHM_GC" # 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, 1, [Have GC_gcj_malloc]) - AC_DEFINE_UNQUOTED(USED_GC_NAME, "System Boehm (with typed GC)", [GC description]) + BOEHM_DEFINES="-DHAVE_GC_GCJ_MALLOC $BOEHM_DEFINES" + AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "System Boehm (with typed GC)", [GC description]) + gc_msg="System Boehm with typed GC" else - AC_DEFINE_UNQUOTED(USED_GC_NAME, "System Boehm (no typed GC)", [GC description]) + AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "System Boehm (no typed GC)", [GC description]) + gc_msg="System Boehm (without typed GC)" 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, 1, [Have 'GC_enable']) + BOEHM_DEFINES="-DHAVE_GC_ENABLE $BOEHM_DEFINES" fi + + # check whether we need to explicitly allow + # thread registering + AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl) + if test "x$found_allow_register_threads" = "xyes"; then + AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration]) + fi + ;; xincluded) - found_boehm=yes - gc_headers=yes use_included_gc=yes libgc_dir=libgc @@ -868,35 +856,24 @@ 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, 1, [Have Boehm GC]) - AC_SUBST(HAVE_BOEHM_GC) - - AC_DEFINE(HAVE_GC_H, 1, [Have gc.h]) - AC_DEFINE(USE_INCLUDED_LIBGC, 1, [Use included libgc]) + BOEHM_DEFINES="-DHAVE_BOEHM_GC -DHAVE_GC_H -DUSE_INCLUDED_LIBGC -DHAVE_GC_GCJ_MALLOC -DHAVE_GC_ENABLE" - # The included libgc contains GCJ support - AC_DEFINE(HAVE_GC_GCJ_MALLOC, 1, [Have GC_gcj_malloc]) - AC_DEFINE(HAVE_GC_ENABLE, 1, [Have GC_enable]) + gc_msg="bundled Boehm GC with typed GC" if test x$enable_parallel_mark = xyes; then - AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description]) + AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description]) + gc_msg="$gc_msg and parallel mark" else - AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC)", [GC description]) + AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC)", [GC description]) fi ;; xsgen) - found_boehm=no - gc_headers=no - use_included_gc=no - AC_DEFINE(HAVE_SGEN_GC,1,[Using the simple generational GC.]) - AC_DEFINE(HAVE_MOVING_COLLECTOR,1,[The GC can move objects.]) - AC_DEFINE(HAVE_WRITE_BARRIERS,1,[The GC needs write barriers.]) - AC_DEFINE_UNQUOTED(USED_GC_NAME, "Simple generational", [GC description]) + AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration") ;; xnone) AC_MSG_WARN("Compiling mono without GC.") - AC_DEFINE_UNQUOTED(USED_GC_NAME, "none", [GC description]) + AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "none", [GC description]) AC_DEFINE(HAVE_NULL_GC,1,[No GC support.]) ;; *) @@ -906,7 +883,6 @@ esac 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" fi @@ -915,6 +891,7 @@ AC_SUBST(LIBGC_CFLAGS) AC_SUBST(LIBGC_LIBS) AC_SUBST(LIBGC_STATIC_LIBS) AC_SUBST(libgc_dir) +AC_SUBST(BOEHM_DEFINES) dnl dnl End of libgc checks @@ -980,7 +957,7 @@ if test x$target_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 (defaults to yes)],[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=$ikvm_native]) ikvm_native_dir= if test x$with_ikvm_native = xyes; then @@ -1007,9 +984,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 *** @@ -1525,12 +1504,12 @@ if test x$target_win32 = xno; then dnl ********************************* dnl *** Checks for math functions *** dnl ********************************* - LIBS="$LIBS -lm"; + AC_SEARCH_LIBS(sqrtf, m) 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 ], [ finite(0.0); ], - AC_DEFINE(HAVE_FINITE, 1, [Have finite]) AC_MSG_RESULT(yes), + AC_DEFINE(HAVE_FINITE, 1, [Have finite in -lm]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))) fi AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h) @@ -1568,6 +1547,12 @@ if test x$target_win32 = xno; then AC_DEFINE(HAVE_EPOLL, 1, [epoll supported]) fi + havekqueue=no + AC_CHECK_FUNCS(kqueue, , AC_MSG_CHECKING(for kqueue in sys/event.h) + AC_TRY_LINK([#include ], + [ kqueue(); ], + AC_DEFINE(HAVE_KQUEUE, 1, [Have kqueue]) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) dnl ****************************** dnl *** Checks for SIOCGIFCONF *** dnl ****************************** @@ -1762,6 +1747,11 @@ if test x$target_win32 = xno; then dnl * on xp+ AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available]) else + dnl ********************************* + dnl *** Checks for Windows compilation *** + dnl ********************************* + AC_CHECK_HEADERS(winternl.h) + jdk_headers_found=no 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?)) @@ -1845,6 +1835,7 @@ fi AC_CHECK_FUNCS(round) AC_CHECK_FUNCS(rint) +AC_CHECK_FUNCS(execvp) dnl **************************** dnl *** Look for /dev/random *** @@ -1857,7 +1848,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" ;; @@ -1995,11 +1986,33 @@ fi AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes]) AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes]) +dnl ************** +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 + MONO_NACL_ALIGN_MASK_OFF=1 + CPPFLAGS="$CPPFLAGS -D__native_client_codegen__" + 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) + 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 AC_PATH_PROG(LLVM_CONFIG, llvm-config, no) @@ -2020,9 +2033,14 @@ if test "x$enable_llvm" = "xyes"; then llvm_version=`$LLVM_CONFIG --version` major_version=`echo $llvm_version | cut -c 1` minor_version=`echo $llvm_version | cut -c 3` + if echo $llvm_version | grep -q 'mono'; then + AC_DEFINE(LLVM_MONO_BRANCH, 1, [Whenever we are using the mono branch of LLVM]) + LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MONO_BRANCH" + fi AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries]) AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries]) + AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties]) # Have to pass these on the command line since mini-llvm-cpp.h already includes # llvm's config.h @@ -2036,6 +2054,10 @@ if test "x$enable_llvm" = "xyes"; then fi AM_CONDITIONAL(ENABLE_LLVM, [test x$enable_llvm = xyes]) +if test "x$enable_loadedllvm" = "xyes"; then + AC_DEFINE(MONO_LLVM_LOADED, 1, [The LLVM back end is dynamically loaded]) +fi +AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes]) TARGET="unknown" ACCESS_UNALIGNED="yes" @@ -2050,8 +2072,9 @@ X11="libX11.so" sizeof_register="SIZEOF_VOID_P" -jit_wanted=false +jit_wanted=true interp_wanted=false +sgen_supported=false case "$host" in # mips-sgi-irix5.* | mips-sgi-irix6.*) # TARGET=MIPS; @@ -2062,7 +2085,6 @@ case "$host" in arch_target=mips; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true AC_MSG_CHECKING(for mips n32) AC_TRY_COMPILE([], [ @@ -2082,7 +2104,6 @@ case "$host" in TARGET=X86; arch_target=x86; JIT_SUPPORTED=yes - jit_wanted=true case $host_os in solaris*) LIBC="libc.so" @@ -2110,20 +2131,40 @@ case "$host" in haiku*) LIBC=libroot.so ;; + linux*) + sgen_supported=true + AOT_SUPPORTED="yes" + ;; + darwin*|openbsd*|freebsd*) + sgen_supported=true + ;; esac ;; x86_64-*-* | amd64-*-*) TARGET=AMD64; arch_target=amd64; JIT_SUPPORTED=yes - jit_wanted=true + case $host_os in + linux*) + sgen_supported=true + AOT_SUPPORTED="yes" + ;; + 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 arch_target=ia64 ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true LIBC="libc.so.6.1" INTL="libc.so.6.1" AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)]) @@ -2144,7 +2185,6 @@ case "$host" in LIBC="libc.so" INTL="libintl.so" esac - jit_wanted=true if test x"$GCC" = xyes; then # We don't support v8 cpus CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9" @@ -2157,7 +2197,6 @@ case "$host" in TARGET=ALPHA; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true arch_target=alpha; CFLAGS="$CFLAGS -mieee -O0" case $host_os in @@ -2184,7 +2223,6 @@ case "$host" in arch_target=hppa; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true ;; macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* ) @@ -2198,29 +2236,34 @@ case "$host" in fi arch_target=ppc; JIT_SUPPORTED=yes - jit_wanted=true + case $host_os in + linux*|darwin*) + sgen_supported=true + ;; + esac ;; arm*-darwin*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" - jit_wanted=true + CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6=1" + sgen_supported=true ;; arm*-linux*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true + sgen_supported=true + AOT_SUPPORTED="yes" ;; s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="yes" JIT_SUPPORTED=yes - jit_wanted=true + sgen_supported=true # Required CFLAGS for s390[x]. USE_STRING_INLINES is automatic with gcc 4.1 CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" ;; @@ -2229,7 +2272,7 @@ case "$host" in arch_target=s390x; ACCESS_UNALIGNED="yes" JIT_SUPPORTED=yes - jit_wanted=true + sgen_supported=true CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" ;; esac @@ -2259,6 +2302,37 @@ 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 + ;; + armv7l-unknown-linux-gnueabi*) + # TEGRA + TARGET=ARM; + arch_target=arm; + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__" + jit_wanted=true + # Can't use tls, since it depends on the runtime detection of tls offsets + # in mono-compiler.h + with_tls=pthread + ;; + armv5tel-unknown-linux-gnueabi*) + TARGET=ARM; + arch_target=arm; + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" + jit_wanted=true + # Can't use tls, since it depends on the runtime detection of tls offsets + # in mono-compiler.h + with_tls=pthread + ;; *) AC_MSG_WARN([Cross compiling is only supported for targets matching 'powerpc64-{ps3,xbox360}-linux-gnu']) esac @@ -2282,6 +2356,9 @@ POWERPC64) AC_DEFINE(TARGET_POWERPC, 1, [...]) AC_DEFINE(TARGET_POWERPC64, 1, [...]) ;; +S390x) + AC_DEFINE(TARGET_S390X, 1, [...]) + ;; esac if test "x$sizeof_register" = "x4"; then @@ -2308,21 +2385,27 @@ if test "x$have_deprecated" = "xyes"; then AC_DEFINE(HAVE_DEPRECATED, 1, [Support for the deprecated attribute]) fi -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 - jit_wanted=false - fi -]) - -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 - interp_wanted=false - 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=$build_sgen_default]) +if test x$buildsgen = xyes; then + if $sgen_supported; then + SGEN_DEFINES="-DHAVE_SGEN_GC -DHAVE_MOVING_COLLECTOR -DHAVE_WRITE_BARRIERS" + gc_msg="sgen and $gc_msg" + else + buildsgen=no + AC_MSG_WARN("Sgen is not supported on this platform") + fi +fi +AC_SUBST(SGEN_DEFINES) +AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes) USEJIT=false if test x$JIT_SUPPORTED = xyes; then @@ -2364,10 +2447,14 @@ case "$host" in *-*-*freebsd*) LIBC="libc.so" INTL="libintl.so" + SQLITE="libsqlite.so" + SQLITE3="libsqlite3.so" ;; *-*-*openbsd*) LIBC="libc.so" INTL="libintl.so" + SQLITE="libsqlite.so" + SQLITE3="libsqlite3.so" ;; *-*-*linux*) AC_PATH_X @@ -2426,12 +2513,18 @@ if test "x$try_mono_debugger" = "xyes"; then fi fi +# disable the debugger entirely when building with moonlight +if test "x$with_moonlight" != "xno"; then + mono_debugger_supported=no +fi + AC_MSG_CHECKING(if the Mono Debugger is supported on this platform) if test "x$mono_debugger_supported" = "xyes"; then - AC_DEFINE(MONO_DEBUGGER_SUPPORTED,1,[The Mono Debugger is supported on this platform]) + BOEHM_DEFINES="$BOEHM_DEFINES -DMONO_DEBUGGER_SUPPORTED" + NESTED_LIBGC_FLAGS="-DMONO_DEBUGGER_SUPPORTED" fi -AC_MSG_RESULT($mono_debugger_supported) AM_CONDITIONAL(MONO_DEBUGGER_SUPPORTED, test x$mono_debugger_supported = xyes) +AC_MSG_RESULT($mono_debugger_supported) if test "x$with_tls" = "x__thread"; then AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword]) @@ -2453,13 +2546,32 @@ if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_bui dnl ****************************************** AC_MSG_CHECKING(which FPU to use) - AC_TRY_COMPILE([], [ - __asm__ ("ldfd f0, [r0]"); - ], fpu=FPA, fpu=NONE) + ORIG_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" + AC_TRY_RUN([ + int main () { __asm__ ("faddd d7, d6, d7"); return 0; } + ], fpu=VFP, fpu=NONE) + CFLAGS=$ORIG_CFLAGS + + if test x$fpu = xNONE; then + AC_TRY_COMPILE([], [ + __asm__ ("ldfd f0, [r0]"); + ], fpu=FPA, fpu=NONE) + fi AC_MSG_RESULT($fpu) CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" unset fpu + + AC_MSG_CHECKING(for ARMV6) + AC_TRY_RUN([ + int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; } + ], armv6=yes, armv6=no) + + AC_MSG_RESULT($armv6) + if test ${armv6} = yes; then + AC_DEFINE(HAVE_ARMV6, 1, "Host supports ARMV6 instructions") + fi fi if test ${TARGET} = unknown; then @@ -2480,10 +2592,14 @@ case "x$gc" in # 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 + LIBGC_CPPFLAGS="$CPPFLAGS $NESTED_LIBGC_FLAGS" 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) ;; @@ -2491,7 +2607,8 @@ esac #AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0 FX (defaults to yes)], [], [with_profile2=yes]) AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to yes)], [], [with_profile4=yes]) -AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the raw MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no]) +AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid 2.1 assemblies (defaults to no)], [], [with_monodroid=no]) +AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no]) OPROFILE=no AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defaults to no)],[ @@ -2522,16 +2639,23 @@ AC_ARG_WITH(mcs_docs,[ --with-mcs-docs=yes,no If you want to build the DISABLE_MCS_DOCS=yes fi ]) +if test x$with_profile4 != xyes; then + DISABLE_MCS_DOCS=yes +fi +MOONLIGHT_DEFINES= AC_ARG_WITH(moonlight, [ --with-moonlight=yes|no|only If you want to build Mono for Moonlight (defaults to no)],[ - if test "x$with_moonlight" = "xyes"; then - AC_DEFINE(MOONLIGHT,1,[Building for Moonlight]) - elif test "x$with_moonlight" = "xonly"; then - AC_DEFINE(MOONLIGHT,1,[Building for Moonlight]) + 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], @@ -2559,7 +2683,11 @@ 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]) AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) @@ -2765,7 +2893,6 @@ mono/profiler/Makefile ikvm-native/Makefile scripts/Makefile man/Makefile -web/Makefile docs/Makefile data/Makefile data/net_2_0/Makefile @@ -2773,6 +2900,7 @@ data/net_4_0/Makefile data/net_2_0/Browsers/Makefile data/mint.pc data/mono-2.pc +data/monosgen-2.pc data/mono.pc data/mono-cairo.pc data/mono-nunit.pc @@ -2856,7 +2984,16 @@ fi echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make fi - if test x$TARGET = xAMD64 -a x$host_win32 = xno -a "x$AOT_SUPPORTED" = "xyes" -a x$enable_system_aot = xyes; then + if test x$AOT_SUPPORTED = xyes -a x$enable_system_aot = xdefault; then + enable_system_aot=yes + fi + + if test "x$enable_loadedllvm" = "xyes"; then + # This seems to fail on the x86 buildbots + enable_system_aot=no + fi + + if test x$host_win32 = xno -a x$platform_darwin != xyes -a x$enable_system_aot = xyes; then echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make fi @@ -2895,8 +3032,7 @@ echo " olive source: $olive_topdir Engine: - GC: $gc - GLIB: $with_glib + GC: $gc_msg TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status @@ -2904,10 +3040,11 @@ echo " BigArrays: $enable_big_arrays DTrace: $enable_dtrace Parallel Mark: $enable_parallel_mark - LLVM Back End: $enable_llvm + 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 libgdiplus: $libgdiplus_msg @@ -2917,18 +3054,3 @@ echo " if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs) fi - -if test x$gc = xsgen; then - echo IMPORTANT: - echo IMPORTANT: You have selected an experimental, work-in-progress - echo IMPORTANT: GC engine. This GC engine is currently not supported - echo IMPORTANT: and is not yet ready for use. - 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 has known problems. - echo IMPORTANT: -fi