X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=efe523a85e222e028ba27a78d73206153bc544b9;hb=31986589373632b41b5590a4dac66bcc36f216a1;hp=a302e530dd4b21d41f3c2fd1bed29cd1c53e2394;hpb=7c4a8f6366aeeb675b5648de51f604a91739e5ef;p=mono.git diff --git a/configure.in b/configure.in index a302e530dd4..efe523a85e2 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.8.1) AM_MAINTAINER_MODE API_VER=2.0 @@ -67,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*) @@ -156,7 +157,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 @@ -179,9 +180,22 @@ 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]) + ;; *-*-hpux*) host_win32=no CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT" @@ -350,7 +364,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, [], [], @@ -549,8 +563,6 @@ AC_ARG_WITH([glib], [ --with-glib=embedded|system Choose glib API: system or embedded (default to embedded)], [], [with_glib=embedded]) -eglib_dir= - ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\"" AC_CONFIG_SUBDIRS(eglib) @@ -562,39 +574,13 @@ embedded) BUILD_GLIB_LIBS="$GLIB_LIBS" GMODULE_CFLAGS="$GLIB_CFLAGS" GMODULE_LIBS="$GLIB_LIBS" - eglib_dir=eglib ;; system) - if test "x$PKG_CONFIG" = "xno"; then - AC_MSG_ERROR([You need to install pkg-config]) - fi - 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 test "x$PKG_CONFIG" = "xno"; then - AC_MSG_ERROR([You need to install pkg-config]) - fi - 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([--with-glib=system is no longer supported as of Mono 2.8]) ;; *) AC_MSG_ERROR([Invalid argument to --with-glib.]) esac -AM_CONDITIONAL(EGLIB_BUILD, test x$with_glib = xembedded) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -602,7 +588,6 @@ 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) @@ -636,17 +621,23 @@ 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 + 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]) @@ -675,17 +666,13 @@ 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'" @@ -805,6 +792,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) {} @@ -985,7 +977,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 @@ -2000,11 +1992,28 @@ 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) + +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 +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(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) @@ -2046,6 +2055,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" @@ -2121,7 +2134,11 @@ case "$host" in haiku*) LIBC=libroot.so ;; - linux*|darwin*) + linux*) + sgen_supported=true + AOT_SUPPORTED="yes" + ;; + darwin*|openbsd*) sgen_supported=true ;; esac @@ -2132,7 +2149,11 @@ case "$host" in JIT_SUPPORTED=yes jit_wanted=true case $host_os in - linux*|darwin*) + linux*) + sgen_supported=true + AOT_SUPPORTED="yes" + ;; + darwin*|openbsd*) sgen_supported=true ;; esac @@ -2247,6 +2268,7 @@ case "$host" in 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" ;; @@ -2256,6 +2278,7 @@ case "$host" in ACCESS_UNALIGNED="yes" JIT_SUPPORTED=yes jit_wanted=true + sgen_supported=true CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" ;; esac @@ -2473,11 +2496,17 @@ 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 BOEHM_DEFINES="$BOEHM_DEFINES -DMONO_DEBUGGER_SUPPORTED" NESTED_LIBGC_FLAGS="-DMONO_DEBUGGER_SUPPORTED" fi +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 @@ -2538,7 +2567,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)],[ @@ -2569,14 +2599,15 @@ 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]) - fi + MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING" ], [with_moonlight=no]) +AC_SUBST(MOONLIGHT_DEFINES) @@ -2607,6 +2638,7 @@ libmono_ldflags="$libmono_ldflags $LIBS" AM_CONDITIONAL(MOONLIGHT, [test "x$with_moonlight" != "xno"]) AM_CONDITIONAL(ONLY_MOONLIGHT, [test "x$with_moonlight" = "xonly"]) 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) @@ -2903,7 +2935,11 @@ 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$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 @@ -2951,10 +2987,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 + MonoDroid: $with_monodroid MonoTouch: $with_monotouch JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg @@ -2964,9 +3001,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$enable_llvm = xyes; then - echo IMPORTANT: - echo IMPORTANT: The LLVM Back End is experimental and has known problems. - echo IMPORTANT: -fi