X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=9154acf44e75b0c85a1d5349810f2cfac5016f4a;hb=d37df4b0c64f75e7de39a13ec614c7c2719a0491;hp=7a4803a3f6977ac348689539cd73eed175bcd65c;hpb=d759d81c61f92d54f495b9e0899266378944ea51;p=mono.git diff --git a/configure.ac b/configure.ac index 7a4803a3f69..9154acf44e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. #AC_PREREQ([2.62]) -AC_INIT(mono, [4.1.0], +AC_INIT(mono, [4.3.0], [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono]) AC_CONFIG_SRCDIR([README.md]) @@ -41,12 +41,6 @@ esac # libgc_configure_args= -if test -d $srcdir/libgc ; then - libgc_default=included -else - libgc_default=boehm -fi - # These variables are the CPPFLAGS/CFLAGS passed to libgc's configure # libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0 CPPFLAGS_FOR_LIBGC=$CPPFLAGS @@ -83,43 +77,33 @@ has_dtrace=no parallel_mark=yes ikvm_native=yes -case "$host" in - powerpc*-*-linux*) - # https://bugzilla.novell.com/show_bug.cgi?id=504411 - disable_munmap=yes - ;; -esac - host_win32=no target_win32=no platform_android=no -platform_darwin=no +host_darwin=no case "$host" in *-mingw*|*-*-cygwin*) - AC_DEFINE(HOST_WIN32,1,[Host 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]) host_win32=yes mono_cv_clang=no if test "x$cross_compiling" = "xno"; then - target_win32=yes if test "x$host" == "x$build" -a "x$host" == "x$target"; then - AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32]) + target_win32=yes fi else - target_win32=yes - AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32/MinGW]) - AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW]) + if test "x$host" == "x$target"; then + target_win32=yes + fi fi HOST_CC="gcc" - # Windows XP SP2 is required - CPPFLAGS="$CPPFLAGS -DWINVER=0x0502 -D_WIN32_WINNT=0x0502 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024" + # Windows Vista or later is required + CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024" LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32 -liphlpapi" libmono_cflags="-mms-bitfields -mwindows" libmono_ldflags="-mms-bitfields -mwindows" libdl= libgc_threads=win32 - libgc_default=included with_sigaltstack=no with_tls=pthread LN_S=cp @@ -127,7 +111,6 @@ case "$host" in libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes" ;; *-*-*netbsd*) - host_win32=no CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE" libmono_cflags="-D_REENTRANT" LDFLAGS="$LDFLAGS -pthread" @@ -140,7 +123,6 @@ case "$host" in use_sigposix=yes ;; *-*-kfreebsd*-gnu) - host_win32=no CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread" libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread" libmono_ldflags="-lpthread -pthread" @@ -151,7 +133,6 @@ case "$host" in use_sigposix=yes ;; *-*-*freebsd*) - host_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" libmono_cflags= @@ -175,7 +156,6 @@ case "$host" in has_dtrace=yes ;; *-*-*openbsd*) - host_win32=no 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" @@ -185,13 +165,11 @@ case "$host" in need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) libdl= - libgc_default=boehm libgc_threads=pthreads with_sigaltstack=no use_sigposix=yes ;; *-*-linux-android*) - host_win32=no platform_android=yes AC_DEFINE(PLATFORM_ANDROID,1,[Targeting the Android platform]) AC_DEFINE(TARGET_ANDROID,1,[Targeting the Android platform]) @@ -230,7 +208,6 @@ case "$host" in mono_cv_clang=no ;; *-*-linux*) - 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" @@ -249,10 +226,13 @@ case "$host" in support_boehm=no with_gc=sgen ;; + powerpc*-*-linux*) + # https://bugzilla.novell.com/show_bug.cgi?id=504411 + disable_munmap=yes + ;; esac ;; *-*-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" @@ -260,14 +240,12 @@ case "$host" in libmono_cflags="-D_REENTRANT" libdl= libgc_threads=pthreads - libgc_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" # +ESdbgasm only valid on bundled cc on RISC # silently ignored for ia64 @@ -286,7 +264,6 @@ case "$host" in use_sigposix=yes ;; *-*-solaris*) - host_win32=no CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DPLATFORM_SOLARIS" need_link_unlink=yes libmono_cflags="-D_REENTRANT" @@ -299,10 +276,9 @@ case "$host" in ;; *-*-darwin*) parallel_mark="Disabled_Currently_Hangs_On_MacOSX" - host_win32=no - platform_darwin=yes + host_darwin=yes target_mach=yes - CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" libmono_cflags="-D_THREAD_SAFE" need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) @@ -338,7 +314,6 @@ case "$host" in esac ;; *-*-haiku*) - host_win32=no CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_THREAD_SAFE" libmono_cflags="-D_REENTRANT -D_THREAD_SAFE" libdl= @@ -350,7 +325,6 @@ case "$host" in ;; *) AC_MSG_WARN([*** Please add $host to configure.ac checks!]) - host_win32=no libdl="-ldl" ;; esac @@ -360,12 +334,19 @@ if test x$need_link_unlink = xyes; then AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace]) fi +if test x$host_win32 = xyes; then + AC_DEFINE(HOST_WIN32, 1, [Host Platform is Win32]) +fi + +if test x$target_win32 = xyes; then + AC_DEFINE(TARGET_WIN32, 1, [Target Platform is Win32]) +fi + AC_SUBST(extra_runtime_ldflags) AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes) AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes) -AM_CONDITIONAL(PLATFORM_GNU, echo x$target_os | grep -q -- -gnu) AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux) -AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes) +AM_CONDITIONAL(PLATFORM_DARWIN, test x$host_darwin = xyes) AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes) AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes) @@ -431,7 +412,7 @@ AC_PROG_LD_GNU AM_ICONV() -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 sys/sysctl.h libproc.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 sys/sysctl.h libproc.h sys/prctl.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 sys/inotify.h arpa/inet.h complex.h) AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h], [], [], [#include @@ -519,13 +500,13 @@ AC_CACHE_CHECK([for clang], []) ]) -AC_ARG_ENABLE(visiblity-hidden, -[ --disable-visibility-hidden disable usage of -fvisiblity=hidden] - disable_visibility_hidden=no, disable_visibility_hidden=yes) +AC_ARG_ENABLE(visibility-hidden, +[ --disable-visibility-hidden disable usage of -fvisiblity=hidden], + disable_visibility_hidden=yes, disable_visibility_hidden=no) 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 -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value' + WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value -Wno-attributes' # We require C99 with some GNU extensions, e.g. `linux` macro CFLAGS="$CFLAGS -std=gnu99" @@ -631,17 +612,6 @@ fi AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) -# Where's the 'olive' source tree? -if test -d $srcdir/olive; then - olivedir=olive -else - olivedir=../olive -fi - -if test -d $srcdir/$olivedir; then -olive_topdir='$(top_srcdir)/'$olivedir -fi - # gettext: prepare the translation directories. # we do not configure the full gettext, as we consume it dynamically from C# AM_PO_SUBDIRS @@ -681,17 +651,9 @@ AC_CONFIG_SUBDIRS(eglib) 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) -AC_SUBST(GMODULE_CFLAGS) -AC_SUBST(GMODULE_LIBS) -AC_SUBST(BUILD_GLIB_CFLAGS) -AC_SUBST(BUILD_GLIB_LIBS) # Enable support for fast thread-local storage # Some systems have broken support, so we allow to disable it. @@ -967,12 +929,6 @@ if test x$has_extension_module != xno ; then AC_MSG_NOTICE([Enabling mono extension module.]) fi -AC_ARG_ENABLE(gsharing, [ --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no) -if test x$enable_gsharing = xyes; then - AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing]) -fi - -# A synonym AC_ARG_ENABLE(gsharedvt, [ --enable-gsharedvt Enable generic valuetype sharing], enable_gsharedvt=$enableval, enable_gsharedvt=no) if test x$enable_gsharedvt = xyes; then AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharedvt]) @@ -1015,7 +971,7 @@ dnl dnl Boehm GC configuration dnl -AC_ARG_WITH(libgc, [ --with-gc=boehm,included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=$libgc_default]) +AC_ARG_WITH(libgc, [ --with-gc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included]) AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes}) AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes) @@ -1025,55 +981,13 @@ if test x$enable_parallel_mark = xyes; then libgc_configure_args="$libgc_configure_args --enable-parallel-mark" fi -gc_headers=no gc_msg="" -use_included_gc=no LIBGC_CPPFLAGS= LIBGC_LIBS= LIBGC_STATIC_LIBS= libgc_dir= case "x$libgc" in - xboehm|xbohem|xyes) - AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes) - AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl) - - if test "x$found_boehm" != "xyes"; then - AC_MSG_ERROR("GC requested but libgc not found! Install libgc or run configure with --with-gc=none.") - fi - if test "x$gc_headers" != "xyes"; then - AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.") - fi - - 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 - 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(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 - 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) - use_included_gc=yes if test "x$support_boehm" = "xyes"; then libgc_dir=libgc fi @@ -1082,7 +996,7 @@ case "x$libgc" in LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la' LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la' - BOEHM_DEFINES="-DHAVE_BOEHM_GC -DHAVE_GC_H -DUSE_INCLUDED_LIBGC -DHAVE_GC_GCJ_MALLOC -DHAVE_GC_ENABLE" + BOEHM_DEFINES="-DHAVE_BOEHM_GC" if test x$target_win32 = xyes; then BOEHM_DEFINES="$BOEHM_DEFINES -DGC_NOT_DLL" @@ -1098,6 +1012,10 @@ case "x$libgc" in fi ;; + xboehm|xbohem|xyes) + AC_MSG_WARN("External Boehm is no longer supported") + ;; + xsgen) AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration") ;; @@ -1118,7 +1036,6 @@ if test "x$large_heap" = "xyes"; then CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG" fi -AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) AC_SUBST(LIBGC_CPPFLAGS) AC_SUBST(LIBGC_LIBS) AC_SUBST(LIBGC_STATIC_LIBS) @@ -1153,8 +1070,10 @@ dnl *** Checks for signals dnl *********************************** AC_CHECK_HEADERS(signal.h) AC_CHECK_FUNCS(sigaction) +AC_CHECK_FUNCS(kill) +AC_CHECK_FUNCS(signal) -if test x$target_win32 = xno; then +if test x$host_win32 = xno; then dnl hires monotonic clock support AC_SEARCH_LIBS(clock_gettime, rt) @@ -1229,6 +1148,7 @@ if test x$target_win32 = xno; then AC_CHECK_FUNCS(dladdr) AC_CHECK_FUNCS(sysconf) AC_CHECK_FUNCS(getrlimit) + AC_CHECK_FUNCS(prctl) AC_CHECK_FUNCS(sched_setaffinity) AC_CHECK_FUNCS(sched_getcpu) @@ -1991,7 +1911,7 @@ if test x$target_win32 = xno; then dnl * back dnl ************************************** if test "x$havekqueue" = "xyes" -a "x$ac_cv_header_sys_event_h" = "xyes"; then - if test "x$platform_darwin" = "xno"; then + if test "x$host_darwin" = "xno"; then AC_DEFINE(USE_KQUEUE_FOR_THREADPOOL, 1, [Use kqueue for the threadpool]) fi fi @@ -2150,6 +2070,7 @@ if test x$target_win32 = xno; then AC_CHECK_FUNCS(fstatat mknodat readlinkat) AC_CHECK_FUNCS(readv writev preadv pwritev) AC_CHECK_FUNCS(setpgid) + AC_CHECK_FUNCS(system) AC_CHECK_SIZEOF(size_t) AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], , [#include @@ -2238,10 +2159,6 @@ if test x$target_win32 = xno; then #endif ]) AC_CHECK_HEADERS([termios.h]) - - dnl * This is provided in io-layer, but on windows it's only available - dnl * on xp+ - AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available]) else dnl ********************************* dnl *** Checks for Windows compilation *** @@ -2375,6 +2292,24 @@ else AC_MSG_RESULT(no) ]) + dnl ********************************** + dnl *** Check for inet_pton *** + dnl ********************************** + AC_MSG_CHECKING(for inet_pton) + AC_TRY_LINK([ + #include + #include + #include + ], [ + inet_pton (0, NULL, NULL); + ], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_INET_PTON, 1, [Have inet_pton]) + ], [ + AC_MSG_RESULT(no) + ]) + AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include ]]) AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include ]]) AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include ]]) @@ -2382,16 +2317,6 @@ else AC_CHECK_DECLS(InterlockedAdd, [], [], [[#include ]]) AC_CHECK_DECLS(InterlockedAdd64, [], [], [[#include ]]) AC_CHECK_DECLS(__readfsdword, [], [], [[#include ]]) - - AC_MSG_CHECKING(for GetProcessId) - AC_TRY_COMPILE([#include ], [ - GetProcessId (0); - ], [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GETPROCESSID) - ], [ - AC_MSG_RESULT(no) - ]) fi dnl socklen_t check @@ -2509,7 +2434,7 @@ fi AC_MSG_CHECKING([if inter-process shared handles are requested]) # Same as --enable-minimal=shared_handles -AC_ARG_ENABLE(shared-handles, [ --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes) +AC_ARG_ENABLE(shared-handles, [ --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=no) AC_MSG_RESULT($try_shared_handles) if test "x$try_shared_handles" != "xyes"; then AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles]) @@ -2645,7 +2570,7 @@ AC_ARG_WITH(llvm, [ --with-llvm= Enable the LLVM back-end], ena if test "x$enable_llvm" = "xyes"; then if test "x$with_llvm" != "x"; then LLVM_CONFIG=$with_llvm/bin/llvm-config - if test x$target_win32 = xyes; then + if test x$host_win32 = xyes; then LLVM_CONFIG=$LLVM_CONFIG.exe fi if test ! -x $LLVM_CONFIG; then @@ -2665,7 +2590,7 @@ if test "x$enable_llvm" = "xyes"; then ;; esac - if test "x$target_win32" = "xno"; then + if test "x$host_win32" = "xno"; then # The output of --cflags seems to include optimizations flags too LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'` @@ -3072,6 +2997,7 @@ if test "x$host" != "x$target"; then # in mono-compiler.h with_tls=pthread target_mach=no + target_win32=no ;; aarch64*-linux-*) TARGET=ARM64; @@ -3273,7 +3199,7 @@ case "$host" in X11="libX11.so.6" ;; *-*-*freebsd*) - LIBC="libc.so" + LIBC="libc.so.7" INTL="libintl.so" SQLITE="libsqlite.so" SQLITE3="libsqlite3.so" @@ -3389,7 +3315,7 @@ if test ${TARGET} = ARM; then fpu=NONE # iOS GCC always uses the 'softfp' ABI. - if test x"$GCC" = xyes && test x$platform_darwin = xyes; then + if test x"$GCC" = xyes && test x$host_darwin = xyes; then fpu=VFP fi @@ -3523,10 +3449,10 @@ case "x$libgc" in ;; esac -AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes]) +AC_ARG_WITH(profile4_x,[ --with-profile4=yes,no If you want to install the 4.6 FX (defaults to yes)], [], [with_profile4_x=yes]) AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no]) -AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no,only If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no]) -AC_ARG_WITH(xammac, [ --with-xammac=yes,no,only If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no]) +AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=no]) +AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no]) OPROFILE=no AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defaults to no)],[ @@ -3557,7 +3483,7 @@ 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_5 != xyes; then +if test x$with_profile4_x != xyes; then DISABLE_MCS_DOCS=yes fi @@ -3603,7 +3529,7 @@ dnl Consistency settings dnl if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then DISABLE_MCS_DOCS=yes - with_profile4_5=no + with_profile4_x=no with_monodroid=no with_monotouch=no with_xammac=no @@ -3625,12 +3551,10 @@ AC_SUBST(OPROFILE_LIBS) libmono_ldflags="$libmono_ldflags $LIBS" -AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes]) +AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = xyes]) AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"]) AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"]) AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"]) -AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"]) -AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"]) AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) @@ -3651,8 +3575,6 @@ AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM) AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64) AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target") -AM_CONDITIONAL(INCLUDED_LIBGC, test x$libgc = xincluded) - AC_SUBST(LIBC) AC_SUBST(INTL) AC_SUBST(SQLITE) @@ -3685,6 +3607,22 @@ else fi AC_SUBST(mono_cfg_dir) +default_profile=net_4_x +if test -z "$INSTALL_MONODROID_TRUE"; then : + default_profile=monodroid +fi +if test -z "$INSTALL_MONOTOUCH_TRUE"; then : + default_profile=monotouch +fi +if test -z "$INSTALL_XAMMAC_TRUE"; then : + default_profile=xammac +fi +if test -z "$INSTALL_4_x_TRUE"; then : + default_profile=net_4_x +fi +DEFAULT_PROFILE=$default_profile +AC_SUBST(DEFAULT_PROFILE) + AC_CONFIG_FILES([po/mcs/Makefile.in]) AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper]) @@ -3867,15 +3805,10 @@ mono/arch/arm/Makefile mono/arch/arm64/Makefile mono/arch/ia64/Makefile mono/arch/mips/Makefile +mono/sgen/Makefile mono/tests/Makefile mono/tests/tests-config mono/tests/assemblyresolve/Makefile -mono/tests/cas/Makefile -mono/tests/cas/assembly/Makefile -mono/tests/cas/demand/Makefile -mono/tests/cas/inheritance/Makefile -mono/tests/cas/linkdemand/Makefile -mono/tests/cas/threads/Makefile mono/tests/gc-descriptors/Makefile mono/unit-tests/Makefile mono/benchmark/Makefile @@ -3938,7 +3871,7 @@ if test x$host_win32 = xyes; then sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool fi -if test x$platform_darwin = xyes; then +if test x$host_darwin = xyes; then # This doesn't seem to be required and it slows down parallel builds sed -e 's,lock_old_archive_extraction=yes,lock_old_archive_extraction=no,g' < libtool > libtool.new && mv libtool.new libtool && chmod +x libtool fi @@ -3987,7 +3920,7 @@ fi echo "MONO_VERSION = $myver" >> $mcs_topdir/build/config.make - if test x$platform_darwin = xyes; then + if test x$host_darwin = xyes; then echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make fi @@ -4006,20 +3939,6 @@ fi if test x$has_extension_module != xno; then echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make fi - - default_profile=net_4_5 - if test -z "$INSTALL_MONODROID_TRUE"; then : - default_profile=monodroid - fi - if test -z "$INSTALL_MONOTOUCH_TRUE"; then : - default_profile=monotouch - fi - if test -z "$INSTALL_XAMMAC_TRUE"; then : - default_profile=xammac - fi - if test -z "$INSTALL_4_5_TRUE"; then : - default_profile=net_4_5 - fi echo "DEFAULT_PROFILE = $default_profile" >> $srcdir/$mcsdir/build/config.make @@ -4029,22 +3948,6 @@ fi fi - # if we have an olive folder, override the default settings - if test -d $olivedir; then - - if test x$cross_compiling = xno && test x$enable_olive_build != xno; then - - test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build - - echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make - echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make - echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make - echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make - echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make - echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make - fi - fi - ) libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} @@ -4065,7 +3968,7 @@ echo " LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) Libraries: - .NET 4.5: $with_profile4_5 + .NET 4.6: $with_profile4_x MonoDroid: $with_monodroid MonoTouch: $with_monotouch Xamarin.Mac: $with_xammac