X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=928a06347e64803fcb8b761363f7ffdf79f1592f;hb=837adb6a21851e59af6adb4cc9e7c76a56139414;hp=e15c7570b64abda6bba88da397d5aa3578d1cf82;hpb=f0c1a9daad136030afa512c6a20ba1c70c062342;p=mono.git diff --git a/configure.in b/configure.in index e15c7570b64..928a06347e6 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.5) +AM_INIT_AUTOMAKE(mono,2.7) AM_MAINTAINER_MODE API_VER=1.0 @@ -40,6 +40,8 @@ fi # libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0 CPPFLAGS_FOR_LIBGC=$CPPFLAGS CFLAGS_FOR_LIBGC=$CFLAGS +CPPFLAGS_FOR_EGLIB=$CPPFLAGS +CFLAGS_FOR_EGLIB=$CFLAGS # # These are the flags that need to be stored in the mono.pc file for @@ -73,20 +75,27 @@ case "$host" in ;; esac +host_win32=no +target_win32=no case "$host" in *-*-mingw*|*-*-cygwin*) - platform_win32=yes - AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32]) + 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 if test "x$cross_compiling" = "xno"; then + target_win32=yes + AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32]) CC="gcc -mno-cygwin -g" + CXX="g++ -mno-cygwin -g" # So libgc configure gets -mno-cygwin export CC + export CXX fi HOST_CC="gcc" # Windows 2000 is required that includes Internet Explorer 5.01 CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024" + LDFLAGS="$LDFLAGS -lmswsock" libmono_cflags="-mno-cygwin -mms-bitfields -mwindows" libmono_ldflags="-mno-cygwin -mms-bitfields -mwindows" libdl= @@ -98,7 +107,7 @@ case "$host" in libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes" ;; *-*-*netbsd*) - platform_win32=no + host_win32=no CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE" libmono_cflags="-D_REENTRANT" LDFLAGS="$LDFLAGS -pthread" @@ -111,7 +120,7 @@ case "$host" in use_sigposix=yes ;; *-*-*freebsd*) - platform_win32=no + host_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" libmono_cflags= @@ -140,7 +149,7 @@ case "$host" in use_sigposix=yes ;; *-*-*openbsd*) - platform_win32=no + host_win32=no CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD" libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" @@ -152,7 +161,7 @@ case "$host" in use_sigposix=yes ;; *-*-linux*) - platform_win32=no + 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" @@ -165,7 +174,7 @@ case "$host" in use_sigposix=yes ;; *-*-hpux*) - platform_win32=no + 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 @@ -184,7 +193,7 @@ case "$host" in use_sigposix=yes ;; *-*-solaris*) - platform_win32=no + 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" @@ -196,7 +205,7 @@ case "$host" in ;; *-*-darwin*) parallel_mark="Disabled_Currently_Hangs_On_MacOSX" - platform_win32=no + host_win32=no platform_darwin=yes CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent" @@ -213,10 +222,26 @@ 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 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 + i*86-*-darwin10*) + BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5" + CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS" + CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS" + CXXFLAGS="$CXXFLAGS $BROKEN_DARWIN_FLAGS" + CCASFLAGS="$CCASFLAGS $BROKEN_DARWIN_FLAGS" + CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS" + CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS" + CPPFLAGS_FOR_EGLIB="$CPPFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS" + CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS" + ;; + esac ;; *) AC_MSG_WARN([*** Please add $host to configure.in checks!]) - platform_win32=no + host_win32=no libdl="-ldl" ;; esac @@ -226,15 +251,15 @@ 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 -AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) +AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes) +AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes) AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux) AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes) AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes) AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC -# Disabled for now to fix the windows build -#AC_PROG_CXX +AC_PROG_CXX AM_PROG_AS AM_PROG_CC_STDC AC_PROG_INSTALL @@ -269,7 +294,7 @@ AC_SUBST(HOST_CC) AC_SUBST(BUILD_EXEEXT) AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes]) -AM_CONDITIONAL(USE_BATCH_FILES, [test x$platform_win32 = xyes -a x$cross_compiling = xyes]) +AM_CONDITIONAL(USE_BATCH_FILES, [test x$host_win32 = xyes -a x$cross_compiling = xyes]) # Set STDC_HEADERS AC_HEADER_STDC @@ -293,7 +318,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/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h) +AC_CHECK_HEADERS(sys/user.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) AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no]) @@ -478,6 +503,7 @@ embedded) GMODULE_CFLAGS="$GLIB_CFLAGS" GMODULE_LIBS="$GLIB_LIBS" eglib_dir=eglib + ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\"" AC_CONFIG_SUBDIRS(eglib) ;; system) @@ -520,7 +546,7 @@ AC_SUBST(BUILD_GLIB_CFLAGS) AC_SUBST(BUILD_GLIB_LIBS) AC_SUBST(eglib_dir) -if test x$cross_compiling$platform_win32 = xnoyes; then +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) @@ -557,7 +583,7 @@ if test "x$enable_static" = "xno"; then with_static_mono=no fi -if test "x$platform_win32" = "xyes"; then +if test "x$host_win32" = "xyes"; then # Boehm GC requires the runtime to be in its own dll with_static_mono=no fi @@ -589,7 +615,7 @@ 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.], + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd,soft_debug.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do eval "mono_feature_disable_$feature='yes'" @@ -687,7 +713,6 @@ if test "x$mono_feature_disable_verifier" = "xyes"; then AC_MSG_NOTICE([Disabled the metadata and IL verifiers]) fi - if test "x$mono_feature_disable_jit" = "xyes"; then AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.]) AC_MSG_NOTICE([Disabled the JIT engine, only full AOT will be supported]) @@ -700,6 +725,11 @@ if test "x$mono_feature_disable_simd" = "xyes"; then AC_MSG_NOTICE([Disabled SIMD support]) fi +if test "x$mono_feature_disable_soft_debug" = "xyes"; then + AC_DEFINE(DISABLE_SOFT_DEBUG, 1, [Disable Soft Debugger Agent.]) + AC_MSG_NOTICE([Disabled Soft Debugger.]) +fi + AC_MSG_CHECKING(for visibility __attribute__) AC_TRY_COMPILE([], [ void __attribute__ ((visibility ("hidden"))) doit (void) {} @@ -712,6 +742,20 @@ AC_TRY_COMPILE([], [ AC_MSG_RESULT(no) ]) +AC_MSG_CHECKING(for deprecated __attribute__) +AC_TRY_COMPILE([ + int doit (void) __attribute__ ((deprecated)); + int doit (void) { return 0; } +], [ + return 0; +], [ + have_deprecated=yes + AC_MSG_RESULT(yes) +], [ + have_deprecated=no + AC_MSG_RESULT(no) +]) + AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark) if test x$enable_parallel_mark = xyes; then libgc_configure_args="$libgc_configure_args --enable-parallel-mark" @@ -814,7 +858,24 @@ dnl dnl End of libgc checks dnl -if test x$platform_win32 = xno; then +dnl ************************************* +dnl *** Checks for zero length arrays *** +dnl ************************************* +AC_MSG_CHECKING(whether $CC supports zero length arrays) +AC_TRY_COMPILE([ + struct s { + int length; + char data [0]; + }; +], [], [ + AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 0, [Length of zero length arrays]) +], [ + AC_MSG_RESULT(no) + AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 1, [Length of zero length arrays]) +]) + +if test x$target_win32 = xno; then dnl hires monotonic clock support AC_SEARCH_LIBS(clock_gettime, rt) @@ -883,9 +944,35 @@ if test x$platform_win32 = xno; then AC_CHECK_FUNCS(getrusage) AC_CHECK_FUNCS(getpriority) AC_CHECK_FUNCS(setpriority) + AC_CHECK_FUNCS(dl_iterate_phdr) AC_CHECK_FUNCS(sched_setaffinity) + dnl **************************************************************** + dnl *** Check for sched_setaffinity from glibc versions before *** + dnl *** 2.3.4. The older versions of the function only take 2 *** + dnl *** parameters, not 3. *** + dnl *** *** + dnl *** Because the interface change was not made in a minor *** + dnl *** version rev, the __GLIBC__ and __GLIBC_MINOR__ macros *** + dnl *** won't always indicate the interface sched_affinity has. *** + dnl **************************************************************** + AC_MSG_CHECKING(for sched_setaffinity from glibc < 2.3.4) + AC_TRY_COMPILE([#include ], [ + int main() { + int mask = 1; + sched_setaffinity(0, &mask); + } + ], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE(GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY, 1, [Have GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY]) + ], [ + # We have the new, three-parameter version + AC_MSG_RESULT(no) + ]) + + dnl ****************************************************************** dnl *** Check for large file support *** dnl *** (If we were using autoconf 2.50 we'd use AC_SYS_LARGEFILE) *** @@ -1127,23 +1214,6 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT($mono_cv_sizeof_sunpath) AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path]) - dnl ************************************* - dnl *** Checks for zero length arrays *** - dnl ************************************* - AC_MSG_CHECKING(whether $CC supports zero length arrays) - AC_TRY_COMPILE([ - struct s { - int length; - char data [0]; - }; - ], [], [ - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0, [Length of zero length arrays]) - ], [ - AC_MSG_RESULT(no) - AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1, [Length of zero length arrays]) - ]) - dnl ***************************** dnl *** Checks for libxnet *** dnl ***************************** @@ -1724,12 +1794,12 @@ else AC_MSG_RESULT(has been disabled) fi -if test "x$platform_win32" = "xyes"; then +if test "x$host_win32" = "xyes"; then AC_DEFINE(HAVE_CRYPT_RNG) fi if test "x$ac_cv_have_dev_random" = "xno" \ - && test "x$platform_win32" = "xno"; then + && test "x$host_win32" = "xno"; then AC_MSG_WARN([[ *** *** A system-provided entropy source was not found on this system. @@ -1753,12 +1823,6 @@ if test "x$try_shared_handles" != "xyes"; then AC_SUBST(DISABLE_SHARED_HANDLES) fi -if test x$gc = xsgen; then - if test x$with_tls != x__thread; then - AC_MSG_ERROR([The SGEN garbage collector depends on a working __thread implementation, and either --with-thread=pthread was passed to configure, or the configure test for __thread failed.]) - fi -fi - AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check']) AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes]) @@ -1787,7 +1851,7 @@ if test "x$enable_dtrace" = "xyes"; then if test "x$DTRACE" = "xno"; then AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.]) enable_dtrace=no - elif ! $DTRACE -h $srcdir/data/mono.d > /dev/null 2>&1; then + elif ! $DTRACE -h -s $srcdir/data/mono.d > /dev/null 2>&1; then AC_MSG_RESULT([dtrace doesn't support -h option, dtrace support disabled.]) enable_dtrace=no fi @@ -1845,13 +1909,29 @@ if test "x$enable_llvm" = "xyes"; then AC_MSG_ERROR([llvm-config not found.]) fi - LLVM_CXXFLAGS=`$LLVM_CONFIG --cflags` + # 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'` + LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags` LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` - LLVM_LIBS=`$LLVM_CONFIG --libs core engine` + LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen` LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++" + # Should be something like '2.6' or '2.7svn' + llvm_version=`$LLVM_CONFIG --version` + major_version=`echo $llvm_version | cut -c 1` + minor_version=`echo $llvm_version | cut -c 3` + + 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]) + + # Have to pass these on the command line since mini-llvm-cpp.h already includes + # llvm's config.h + LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version" + + AC_SUBST(LLVM_CFLAGS) AC_SUBST(LLVM_CXXFLAGS) AC_SUBST(LLVM_LIBS) + AC_SUBST(LLVM_LDFLAGS) AC_DEFINE(ENABLE_LLVM, 1, [Enable the LLVM back end]) fi @@ -1923,7 +2003,9 @@ case "$host" in # foo.c:6: warning: visibility attribute not supported in this configuration; ignored # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally have_visibility_hidden=no - + ;; + cygwin*) + have_visibility_hidden=no esac ;; x86_64-*-* | amd64-*-*) @@ -1995,14 +2077,13 @@ case "$host" in ;; hppa*linux*) TARGET=HPPA; - AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) 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-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* ) if test "x$ac_cv_sizeof_void_p" = "x8"; then TARGET=POWERPC64; CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__" @@ -2011,7 +2092,6 @@ case "$host" in TARGET=POWERPC; CPPFLAGS="$CPPFLAGS -D__mono_ppc__" fi - AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=ppc; JIT_SUPPORTED=yes jit_wanted=true @@ -2033,7 +2113,6 @@ case "$host" in ;; s390-*-linux*) TARGET=S390; - AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=s390; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes @@ -2043,7 +2122,6 @@ case "$host" in ;; s390x-*-linux*) TARGET=S390x; - AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=s390x; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes @@ -2052,6 +2130,36 @@ case "$host" in ;; esac +if test "x$host" != "x$target"; then + case "$target" in + powerpc64-ps3-linux-gnu) + TARGET=POWERPC64 + arch_target=powerpc64 + AC_DEFINE(TARGET_PS3, 1, [...]) + AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) + # It would be better to just use TARGET_POWERPC64, but lots of code already + # uses this define + AC_DEFINE(__mono_ppc64__, 1, [...]) + AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers]) + sizeof_register=8 + target_byte_order=G_BIG_ENDIAN + ;; + + powerpc64-xbox360-linux-gnu) + TARGET=POWERPC64 + arch_target=powerpc64 + AC_DEFINE(TARGET_XBOX360, 1, [...]) + AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) + # It would be better to just use TARGET_POWERPC64, but lots of code already + # uses this define + sizeof_register=8 + target_byte_order=G_BIG_ENDIAN + ;; + *) + AC_MSG_ERROR([Cross compiling is only supported for targets matching 'powerpc64-{ps3,xbox360}-linux-gnu']) + esac +fi + # FIXME: Define the others as well case "$TARGET" in X86) @@ -2092,6 +2200,10 @@ if test "x$have_visibility_hidden" = "xyes"; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute]) fi +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 @@ -2174,8 +2286,6 @@ esac AC_SUBST(libsuffix) -AC_CHECK_HEADERS(valgrind/memcheck.h) - if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then if test "x$with_tls" = "x__thread"; then # @@ -2202,6 +2312,9 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA"; t *-*-*linux*) mono_debugger_supported=yes ;; + *86-apple-darwin*) + mono_debugger_supported=yes + ;; esac fi fi @@ -2269,9 +2382,10 @@ case "x$gc" in ;; 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(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 no)], [], [with_profile4=no]) AC_ARG_WITH(moonlight, [ --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies (defaults to yes)], [], [with_moonlight=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]) OPROFILE=no AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defaults to no)],[ @@ -2320,9 +2434,9 @@ AC_SUBST(OPROFILE_LIBS) libmono_ldflags="$libmono_ldflags $LIBS" -AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes]) AM_CONDITIONAL(INSTALL_2_1, [test "x$with_moonlight" = xyes]) AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes]) +AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes]) AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) @@ -2367,11 +2481,11 @@ fi AC_SUBST(mono_runtime) mono_cfg_root=$mono_build_root/runtime -if test x$platform_win32 = xyes; then +if test x$host_win32 = xyes; then if test "x$cross_compiling" = "xno"; then mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc else - mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\\'`\\etc + mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\'`\\etc fi else mono_cfg_dir=$mono_cfg_root/etc @@ -2453,6 +2567,34 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser], cd $depth ],[LN_S='$LN_S']) +AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/machine.config], +[ depth=../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/4.0 + cd runtime/etc/mono/4.0 + rm -f machine.config + $LN_S $reldir/data/net_4_0/machine.config machine.config + cd $depth +],[LN_S='$LN_S']) + +AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/web.config], +[ depth=../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/4.0 + cd runtime/etc/mono/4.0 + rm -f web.config + $LN_S $reldir/data/net_4_0/web.config web.config + cd $depth +],[LN_S='$LN_S']) + if test x$enable_quiet_build = xyes; then AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL]) AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) @@ -2460,6 +2602,7 @@ fi AC_OUTPUT([ Makefile +mono-core.spec mono-uninstalled.pc scripts/mono-find-provides scripts/mono-find-requires @@ -2501,8 +2644,8 @@ man/Makefile web/Makefile docs/Makefile data/Makefile -data/net_1_1/Makefile data/net_2_0/Makefile +data/net_4_0/Makefile data/net_2_0/Browsers/Makefile data/mint.pc data/mono.pc @@ -2529,7 +2672,7 @@ msvc/Makefile po/Makefile ]) -if test x$platform_win32 = xyes; then +if test x$host_win32 = xyes; then # Get rid of 'cyg' prefixes in library names sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool # libtool seems to inherit -mno-cygwin from our CFLAGS, and uses it to compile its executable @@ -2585,7 +2728,7 @@ fi echo "PLATFORM = darwin" >> $srcdir/$mcsdir/build/config.make fi - if test x$TARGET = xAMD64 -a x$platform_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then + if test x$TARGET = xAMD64 -a x$host_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make fi @@ -2623,9 +2766,9 @@ echo " TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status - 2.0 Profile: $with_profile2 Moon Profile: $with_moonlight 4.0 Alpha: $with_profile4 + MonoTouch: $with_monotouch JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg @@ -2637,7 +2780,7 @@ echo " $disabled " -if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then +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 @@ -2652,6 +2795,6 @@ fi if test x$enable_llvm = xyes; then echo IMPORTANT: - echo IMPORTANT: The LLVM Back End is experimental and does not work yet. + echo IMPORTANT: The LLVM Back End is experimental and has known problems. echo IMPORTANT: fi