[msvc] Update csproj files

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 97b62853b8c94f500e918966c9d45af0f6920df1..3e910f7ef73febbd49d1c137bf8c82d833df3c6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -770,9 +770,10 @@ AC_ARG_WITH(monotouch_watch, [  --with-monotouch_watch=yes,no   If you want to b
 AC_ARG_WITH(monotouch_tv,    [  --with-monotouch_tv=yes,no      If you want to build the Xamarin.TVOS assemblies (defaults to no)],   [], [with_monotouch_tv=default])
 AC_ARG_WITH(bitcode,         [  --with-bitcode=yes,no           If bitcode is enabled (defaults to no)],                              [], [with_bitcode=default])
 AC_ARG_WITH(xammac,          [  --with-xammac=yes,no            If you want to build the Xamarin.Mac assemblies (defaults to no)],    [], [with_xammac=default])
+AC_ARG_WITH(aot_hybrid,      [  --with-aot_hybrid=yes,no        If you want to build the aot_hybrid assemblies (defaults to no)],     [], [with_aot_hybrid=default])
 AC_ARG_WITH(mobile_static,   [  --with-mobile_static=yes,no     If you want to build the mobile_static assemblies (defaults to no)],  [], [with_mobile_static=default])
 
-AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,mobile_static,bitcode_mobile_static   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
+AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,aot_hybrid,mobile_static,bitcode_mobile_static   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
 
 dnl
 dnl Profile defaults
@@ -786,6 +787,7 @@ with_monotouch_default=no
 with_monotouch_watch_default=no
 with_monotouch_tv_default=no
 with_xammac_default=no
+with_aot_hybrid_default=no
 with_mobile_static_default=no
 
 with_bitcode_default=no
@@ -835,8 +837,8 @@ elif test x$with_runtime_preset = xbitcode_mobile_static; then
    AOT_RUN_FLAGS="--llvmonly"
 elif test x$with_runtime_preset = xhybrid; then
    DISABLE_MCS_DOCS_default=yes
-   with_mobile_default=yes
-   TEST_PROFILE=mobile 
+   with_aot_hybrid_default=yes
+   TEST_PROFILE=aot_hybrid 
    enable_llvm_default=yes
 
    mono_feature_disable_com='yes'
@@ -879,6 +881,9 @@ fi
 if test "x$with_xammac" = "xdefault"; then
    with_xammac=$with_xammac_default
 fi
+if test "x$with_aot_hybrid" = "xdefault"; then
+   with_aot_hybrid=$with_aot_hybrid_default
+fi
 if test "x$with_mobile_static" = "xdefault"; then
    with_mobile_static=$with_mobile_static_default
 fi
@@ -890,8 +895,10 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"]
 AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"])
 AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes")
 AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
+AM_CONDITIONAL(INSTALL_AOT_HYBRID, [test "x$with_aot_hybrid" != "xno"])
 AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
 
+AC_SUBST(INSTALL_AOT_HYBRID)
 AC_SUBST(INSTALL_MOBILE_STATIC)
 
 default_profile=net_4_x
@@ -904,6 +911,9 @@ fi
 if test -z "$INSTALL_XAMMAC_TRUE"; then :
    default_profile=xammac
 fi
+if test -z "$INSTALL_AOT_HYBRID_TRUE"; then :
+   default_profile=aot_hybrid
+fi
 if test -z "$INSTALL_MOBILE_STATIC_TRUE"; then :
    default_profile=mobile_static
 fi
@@ -4431,6 +4441,7 @@ echo "
        Xamarin.WatchOS: $with_monotouch_watch
        Xamarin.TVOS:    $with_monotouch_tv
        Xamarin.Mac:     $with_xammac
+       aot_hybrid:      $with_aot_hybrid
        mobile_static:   $with_mobile_static
        JNI support:     $jdk_headers_found
        libgdiplus:      $libgdiplus_msg