X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=00d0aa5ff142e10a4068c16a106e0a9516796ae2;hb=187bc41b1a52f333b5105ba1028e82559c90091b;hp=e511a928d3f37ece0de6c40aa7cd91ab69ffe319;hpb=41b8883053f79cc4ee08b4515297a2e422b9efa9;p=mono.git diff --git a/configure.ac b/configure.ac index e511a928d3f..00d0aa5ff14 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 @@ -117,7 +111,6 @@ case "$host" in libmono_ldflags="-mms-bitfields -mwindows" libdl= libgc_threads=win32 - libgc_default=included with_sigaltstack=no with_tls=pthread LN_S=cp @@ -183,7 +176,6 @@ 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 @@ -258,7 +250,6 @@ 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]) @@ -300,7 +291,7 @@ case "$host" in host_win32=no platform_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) @@ -437,7 +428,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 @@ -525,7 +516,7 @@ AC_CACHE_CHECK([for clang], []) ]) -AC_ARG_ENABLE(visiblity-hidden, +AC_ARG_ENABLE(visibility-hidden, [ --disable-visibility-hidden disable usage of -fvisiblity=hidden], disable_visibility_hidden=yes, disable_visibility_hidden=no) @@ -1010,7 +1001,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) @@ -1020,55 +1011,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 @@ -1077,7 +1026,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" @@ -1093,6 +1042,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") ;; @@ -1113,7 +1066,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) @@ -1148,6 +1100,8 @@ 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$host_win32 = xno; then @@ -1224,6 +1178,7 @@ if test x$host_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) @@ -2145,6 +2100,7 @@ if test x$host_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 @@ -2522,7 +2478,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]) @@ -3287,7 +3243,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" @@ -3537,10 +3493,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)],[ @@ -3571,7 +3527,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 @@ -3617,7 +3573,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 @@ -3639,12 +3595,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) @@ -3665,8 +3619,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) @@ -3699,6 +3651,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]) @@ -4015,20 +3983,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 @@ -4058,7 +4012,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