X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=00d0aa5ff142e10a4068c16a106e0a9516796ae2;hb=427e3f59fe9ada440982f9ed7dab0b476606302a;hp=d7bfc65a77d237dacf034f05ceab6b07a3c9956e;hpb=4ad59b97e0ec374e86db140611cdcaa5ce2e8b88;p=mono.git diff --git a/configure.ac b/configure.ac index d7bfc65a77d..00d0aa5ff14 100644 --- a/configure.ac +++ b/configure.ac @@ -291,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) @@ -428,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 @@ -1100,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 @@ -1176,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) @@ -2097,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 @@ -2474,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]) @@ -3489,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)],[ @@ -3523,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 @@ -3569,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 @@ -3591,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) @@ -3649,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]) @@ -3965,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 @@ -4008,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