X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=0341987c485a8f92e60172a01459695f365081b6;hb=890f40d7ad1d68ea5ff86ffdd3f6829dbd86b3ab;hp=7eed7e189e293475bbfb3f62f64a8118c077f73e;hpb=82041260ed737b80e1ba8adef3f9a031c069303a;p=mono.git diff --git a/configure.ac b/configure.ac index 7eed7e189e2..0341987c485 100644 --- a/configure.ac +++ b/configure.ac @@ -929,15 +929,8 @@ if test x$has_extension_module != xno ; then AC_MSG_NOTICE([Enabling mono extension module.]) fi -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]) -fi - -AC_ARG_ENABLE(native-types, [ --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no) -if test x$enable_native_types = xyes; then - AC_DEFINE(MONO_NATIVE_TYPES,1,[native types]) -fi +# Deprecated +AC_ARG_ENABLE(gsharedvt, [ --enable-gsharedvt Enable generic valuetype sharing (Deprecated)], enable_gsharedvt=$enableval, enable_gsharedvt=no) AC_MSG_CHECKING(for visibility __attribute__) AC_COMPILE_IFELSE([ @@ -1083,6 +1076,7 @@ if test x$host_win32 = xno; then dnl hires monotonic clock support AC_SEARCH_LIBS(clock_gettime, rt) + AC_CHECK_FUNCS(clock_nanosleep) dnl dynamic loader support AC_CHECK_FUNC(dlopen, DL_LIB="", @@ -2643,19 +2637,16 @@ if test "x$enable_llvm" = "xyes"; then # This might include empty lines LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -` llvm_jit_supported=yes + llvm_jit_libs="jit mcjit $llvm_codegen" if test $llvm_api_version -gt 100; then # Based on llvm 3.9, only aot is currently supported - llvm_jit_supported=no + llvm_jit_libs="orcjit $llvm_codegen" elif test "x$host" != "x$target"; then # No need for jit libs llvm_jit_supported=no + llvm_jit_libs="" fi - if test $llvm_jit_supported = no; then - # No need for jit libs - LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter` - else - LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter jit mcjit $llvm_codegen` - fi + LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter $llvm_jit_libs` if test "x$LLVM_LIBS" == "x"; then echo "$LLVM_CONFIG --libs failed." exit 1 @@ -3103,6 +3094,45 @@ SPARC64) ;; esac +case "$HOST" in +X86) + AC_DEFINE(HOST_X86, 1, [...]) + ;; +AMD64) + AC_DEFINE(HOST_AMD64, 1, [...]) + ;; +ARM) + AC_DEFINE(HOST_ARM, 1, [...]) + ;; +ARM64) + AC_DEFINE(HOST_ARM64, 1, [...]) + ;; +POWERPC) + AC_DEFINE(HOST_POWERPC, 1, [...]) + ;; +POWERPC64) + AC_DEFINE(HOST_POWERPC, 1, [...]) + AC_DEFINE(HOST_POWERPC64, 1, [...]) + ;; +S390X) + AC_DEFINE(HOST_S390X, 1, [...]) + ;; +MIPS) + AC_DEFINE(HOST_MIPS, 1, [...]) + ;; +IA64) + AC_DEFINE(HOST_IA64, 1, [...]) + ;; +SPARC) + AC_DEFINE(HOST_SPARC, 1, [...]) + ;; +SPARC64) + AC_DEFINE(HOST_SPARC64, 1, [...]) + ;; +esac + + + dnl ************* dnl *** VTUNE *** dnl ************* @@ -3283,6 +3313,12 @@ AC_ARG_WITH([libgdiplus], # default install location libgdiplus_install_loc=libgdiplus${libsuffix} +case "$host" in + *-*-*linux*) + libgdiplus_install_loc=libgdiplus${libsuffix}.0 + ;; +esac + case $with_libgdiplus in no|installed) libgdiplus_loc= @@ -3547,35 +3583,34 @@ AC_ARG_WITH(cooperative_gc, [ --with-cooperative-gc=yes|no Enable cooperat fi ], [with_cooperative_gc=no]) -AC_ARG_WITH(checked_build, [ --with-checked-build=yes|no Enable checked build (expensive asserts)) (defaults to no)],[ - if test x$with_checked_build != xno ; then - AC_DEFINE(CHECKED_BUILD,1,[Enable checked build.]) - fi -], [with_checked_build=no]) +AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable checked build (expensive asserts), configure with a comma-separated LIST of checked build modules and then include that same list in the environment variable MONO_CHECK_MODE at runtime. Recognized checked build modules: all, gc, metadata, thread],[ -if test x$with_checked_build != xno ; then - DISABLED_CHECKED_BUILD_TEST=none + if test x$enable_checked_build != x ; then + AC_DEFINE(ENABLE_CHECKED_BUILD,1,[Enable checked build]) + fi + for feature in `echo "$enable_checked_build" | sed -e "s/,/ /g"`; do + eval "mono_checked_build_test_enable_$feature='yes'" + done - AC_ARG_ENABLE(checked_build_test, [ --enable-checked-build-test=LIST drop support for LIST checked build tests. LIST is a comma-separated list from: gc, metadata, thread.], - [ - for feature in `echo "$enable_checked_build_test" | sed -e "s/,/ /g"`; do - eval "mono_checked_build_test_disable_$feature='yes'" - done - DISABLED_CHECKED_BUILD_TEST=$enable_checked_build_test - ],[]) + if test "x$mono_checked_build_test_enable_all" = "xyes"; then + eval "mono_checked_build_test_enable_gc='yes'" + eval "mono_checked_build_test_enable_metadata='yes'" + eval "mono_checked_build_test_enable_thread='yes'" + fi - if test "x$mono_checked_build_test_disable_gc" = "xyes"; then - AC_DEFINE(DISABLE_CHECKED_BUILD_GC, 1, [Disable GC checked build]) + if test "x$mono_checked_build_test_enable_gc" = "xyes"; then + AC_DEFINE(ENABLE_CHECKED_BUILD_GC, 1, [Enable GC checked build]) fi - if test "x$mono_checked_build_test_disable_metadata" = "xyes"; then - AC_DEFINE(DISABLE_CHECKED_BUILD_METADATA, 1, [Disable metadata checked build]) + if test "x$mono_checked_build_test_enable_metadata" = "xyes"; then + AC_DEFINE(ENABLE_CHECKED_BUILD_METADATA, 1, [Enable metadata checked build]) fi - if test "x$mono_checked_build_test_disable_thread" = "xyes"; then - AC_DEFINE(DISABLE_CHECKED_BUILD_THREAD, 1, [Disable thread checked build]) + if test "x$mono_checked_build_test_enable_thread" = "xyes"; then + AC_DEFINE(ENABLE_CHECKED_BUILD_THREAD, 1, [Enable thread checked build]) fi -fi + +], []) AC_CHECK_HEADER([malloc.h], [AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], @@ -4028,10 +4063,6 @@ fi if test x$has_extension_module != xno; then echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make fi - - if test x$enable_gsharedvt = xno; then - echo "MONO_DISABLE_GSHAREDVT = 1" >> $srcdir/$mcsdir/build/config.make - fi echo "DEFAULT_PROFILE = $default_profile" >> $srcdir/$mcsdir/build/config.make