Merge pull request #4433 from kumpera/android-fixes

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c339343805e6bbb5f3d8e360a8753daec8c75194..a8dcb129243b70243727efadf002dd69333022b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 #AC_PREREQ([2.62])
 
 # when bumping version number below, keep it in sync with man/mono.1 too
-AC_INIT(mono, [4.9.0],
+AC_INIT(mono, [4.9.1],
         [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
 
 AC_CONFIG_SRCDIR([README.md])
@@ -882,10 +882,6 @@ elif test x$with_runtime_preset = xhybridaot; then
    with_testing_aot_hybrid_default=yes
    TEST_PROFILE=testing_aot_hybrid 
 
-   mono_feature_disable_com='yes'
-   mono_feature_disable_remoting='yes'
-   mono_feature_disable_appdomains='yes'
-
    AOT_BUILD_FLAGS="--aot=hybrid,$INVARIANT_AOT_OPTIONS"
    AOT_RUN_FLAGS="--hybrid-aot"
 elif test x$with_runtime_preset = xaot; then
@@ -4127,6 +4123,8 @@ if test "x$enable_btls" = "xyes"; then
                BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
                if test "x$with_btls_android_ndk" != "x"; then
                        BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DANDROID_NDK=\"$with_btls_android_ndk\""
+               else
+                       AC_MSG_ERROR([Need to pass the --with-btls-android-ndk argument when building with BTLS support on Android.])
                fi
        fi