[xbuild] Support short-circuiting in conditions.

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index d56379b175256f10bad49f5bbd1d40df85e7c119..8ab977a07d0d909c510d6ffd1a7cfccf0d8cf010 100644 (file)
--- 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.9)
+AM_INIT_AUTOMAKE(mono,2.11)
 AM_MAINTAINER_MODE
 
 API_VER=2.0
@@ -2964,6 +2964,11 @@ fi
           enable_system_aot=yes
        fi
 
+       if test "x$enable_loadedllvm" = "xyes"; then
+          # This seems to fail on the x86 buildbots
+          enable_system_aot=no
+       fi
+
     if test x$host_win32 = xno -a x$platform_darwin != xyes -a x$enable_system_aot = xyes; then
       echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make
     fi
@@ -3004,7 +3009,6 @@ echo "
 
    Engine:
        GC:            $gc_msg 
-       GLIB:          $with_glib
        TLS:           $with_tls
        SIGALTSTACK:   $with_sigaltstack
        Engine:        $jit_status