X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=c5c7ba58b9e3cfbd99ec0da64a13c1f3872cee0f;hb=2d403b3a44d0660dcbb9ee72a8e4ce3ef4047afa;hp=ab8b0d9df601eac754bf1219e87e2064c35d5adf;hpb=bc7bb8ef592a49a0cf771e172b37da0bad64aebd;p=mono.git diff --git a/configure.ac b/configure.ac index ab8b0d9df60..c5c7ba58b9e 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3` # This can be reset to 0 when Mono's version number is bumped # since it's part of the corlib version (the prefix '1' in the full # version number is to ensure the number isn't treated as octal in C) -MONO_CORLIB_COUNTER=1 +MONO_CORLIB_COUNTER=2 MONO_CORLIB_VERSION=`printf "1%02d%02d%02d%03d" $MONO_VERSION_MAJOR $MONO_VERSION_MINOR $MONO_VERSION_BUILD $MONO_CORLIB_COUNTER` AC_DEFINE_UNQUOTED(MONO_CORLIB_VERSION,$MONO_CORLIB_VERSION,[Version of the corlib-runtime interface]) @@ -1031,25 +1031,25 @@ AC_SUBST(DEFAULT_PROFILE) if test x$USE_NLS = xprofile_default; then -if test x$host_darwin = xyes; then -# We make the default value for USE_NLS -# "no" on OSX because it isn't available on most -# default OSX installs. The most common configurations will -# all disable it, so this saves us typing. - USE_NLS=no - AC_SUBST([USE_NLS]) - AC_MSG_RESULT([$USE_NLS]) -else - USE_NLS=yes - AC_SUBST([USE_NLS]) - AC_MSG_RESULT([$USE_NLS]) -fi + AC_MSG_CHECKING([NLS used]) + # We make the default value for USE_NLS + # "no" on OSX because it isn't available on most + # default OSX installs. The most common configurations will + # all disable it, so this saves us typing. + if test x$host_darwin = xyes; then + USE_NLS=no; + else + USE_NLS=yes; + fi + + AC_SUBST([USE_NLS]) + AC_MSG_RESULT([$USE_NLS]) fi AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems. LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, - reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting, + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting, security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do @@ -1170,9 +1170,10 @@ if test "x$mono_feature_disable_normalization" = "xyes"; then AC_MSG_NOTICE([Disabled String normalization support.]) fi -if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then - AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.]) - AC_MSG_NOTICE([Disabled Assembly remapping.]) +#TODO: remove assembly_remapping feature name once everyone is using desktop_loader +if test "x$mono_feature_disable_assembly_remapping" = "xyes" || test "x$mono_feature_disable_desktop_loader" = "xyes"; then + AC_DEFINE(DISABLE_DESKTOP_LOADER, 1, [Disable desktop assembly loader semantics.]) + AC_MSG_NOTICE([Disabled desktop assembly loader semantics.]) fi if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then @@ -1274,7 +1275,7 @@ dnl dnl Boehm GC configuration dnl -AC_ARG_WITH(libgc, [ --with-gc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included]) +AC_ARG_WITH(libgc, [ --with-libgc=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) @@ -1322,7 +1323,7 @@ if test "x$support_boehm" = "xyes"; then ;; xsgen) - AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration") + AC_MSG_WARN("Use --with-sgen instead, --with-libgc= controls Boehm configuration") ;; xnone) @@ -1332,7 +1333,7 @@ if test "x$support_boehm" = "xyes"; then gc_msg="none" ;; *) - AC_MSG_ERROR([Invalid argument to --with-gc.]) + AC_MSG_ERROR([Invalid argument to --with-libgc.]) ;; esac @@ -3023,7 +3024,7 @@ if test "x$enable_llvm" = "xyes"; then LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version" fi - AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties]) + AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraries]) AC_SUBST(LLVM_CFLAGS) AC_SUBST(LLVM_CXXFLAGS) @@ -3161,15 +3162,6 @@ case "$host" in ;; esac ;; - ia64-*-*) - TARGET=IA64 - arch_target=ia64 - ACCESS_UNALIGNED="no" - LIBC="libc.so.6.1" - INTL="libc.so.6.1" - AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)]) - libmono_ldflags="-lunwind" - ;; sparc*-*-*) if test "x$ac_cv_sizeof_void_p" = "x8"; then TARGET=SPARC64 @@ -3234,6 +3226,14 @@ case "$host" in ACCESS_UNALIGNED="no" AOT_SUPPORTED="yes" CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" + BTLS_SUPPORTED=yes + BTLS_PLATFORM=arm + AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no]) + case "$target" in + arm*-linux*-gnueabi) + BTLS_PLATFORM=armsoft + ;; + esac ;; arm*-netbsd*-eabi*) TARGET=ARM; @@ -3254,6 +3254,9 @@ case "$host" in arch_target=arm64 boehm_supported=false AOT_SUPPORTED="yes" + BTLS_SUPPORTED=yes + BTLS_PLATFORM=aarch64 + AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no]) ;; s390x-*-linux*) TARGET=S390X; @@ -3467,9 +3470,6 @@ S390X) MIPS) AC_DEFINE(TARGET_MIPS, 1, [...]) ;; -IA64) - AC_DEFINE(TARGET_IA64, 1, [...]) - ;; SPARC) AC_DEFINE(TARGET_SPARC, 1, [...]) ;; @@ -3504,9 +3504,6 @@ S390X) MIPS) AC_DEFINE(HOST_MIPS, 1, [...]) ;; -IA64) - AC_DEFINE(HOST_IA64, 1, [...]) - ;; SPARC) AC_DEFINE(HOST_SPARC, 1, [...]) ;; @@ -4094,8 +4091,6 @@ dnl ************** AC_ARG_ENABLE(btls, [ --disable-btls Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED) AC_ARG_WITH(btls_android_ndk, [ --with-btls-android-ndk Android NDK for BoringTls]) -AC_ARG_ENABLE(dynamic-btls, [ --enable-dynamic-btls Place the BTLS provider into a separate shared library/archive.], enable_dynamic_btls=$enableval, enable_dynamic_btls=no) - AM_CONDITIONAL(BTLS, test x$enable_btls = xyes) btls_android=no @@ -4124,6 +4119,16 @@ if test "x$enable_btls" = "xyes"; then x86_64) btls_arch=x86_64 ;; + arm) + btls_arch=arm + ;; + armsoft) + btls_arch=arm + btls_cflags="-DOPENSSL_NO_ASM=1" + ;; + aarch64) + btls_arch=aarch64 + ;; android-armv5) BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=12" ;; @@ -4191,7 +4196,6 @@ AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64) AM_CONDITIONAL(X86, test x$TARGET = xX86) AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64) -AM_CONDITIONAL(IA64, test x$TARGET = xIA64) AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS) AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC) AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64) @@ -4227,7 +4231,7 @@ AC_SUBST(mono_build_root) mono_runtime=mono/mini/mono AC_SUBST(mono_runtime) -CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.0.0/tools/csc.exe +CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.3.0/tools/csc.exe if test $csc_compiler = mcs; then CSC=$mcs_topdir/class/lib/build/mcs.exe @@ -4434,12 +4438,10 @@ mono/arch/sparc/Makefile mono/arch/s390x/Makefile 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/gc-descriptors/Makefile mono/tests/testing_gac/Makefile mono/unit-tests/Makefile @@ -4555,7 +4557,19 @@ fi echo "MONO_CORLIB_VERSION = $MONO_CORLIB_VERSION" >> $mcs_topdir/build/config.make if test x$host_darwin = xyes; then - echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make + echo "BUILD_PLATFORM = darwin" >> $mcs_topdir/build/config.make + elif test x$host_win32 = xyes; then + echo "BUILD_PLATFORM = win32" >> $mcs_topdir/build/config.make + else + echo "BUILD_PLATFORM = linux" >> $mcs_topdir/build/config.make + fi + + if test x$host_darwin = xyes; then + echo "HOST_PLATFORM ?= darwin" >> $mcs_topdir/build/config.make + elif test x$host_win32 = xyes; then + echo "HOST_PLATFORM ?= win32" >> $mcs_topdir/build/config.make + else + echo "HOST_PLATFORM ?= linux" >> $mcs_topdir/build/config.make fi if test "x$PLATFORM_AOT_SUFFIX" != "x"; then @@ -4597,9 +4611,6 @@ fi if test "x$enable_btls" = "xyes"; then echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make - if test "x$enable_dynamic_btls" = "xyes"; then - echo "HAVE_DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make - fi fi fi