2009-06-15 Miguel de Icaza <miguel@novell.com>

	* configure.in: Changed the default to not build the 4.0 profile
	unless explicitly enabled.

svn path=/trunk/mono/; revision=136155

diff --git a/ChangeLog b/ChangeLog
index 0f7b1cb2e2561affa9ecfa50cebd50b76ad5a9b7..32bedcf95e97049a2b6071c4d6eeef05910c19f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-15  Miguel de Icaza  <miguel@novell.com>
+
+       * configure.in: Changed the default to not build the 4.0 profile
+       unless explicitly enabled.
+
 2009-06-15  Zoltan Varga  <vargaz@gmail.com>
 
        * CMakeLists.txt: Add mips support.

diff --git a/configure.in b/configure.in
index d41b20c44a81e801bc736044314f2c8d1f5b8014..48201d192ea0a8d46ec4c7e7facb07aae147b613 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -601,8 +601,8 @@ AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsy
 AC_DEFINE_UNQUOTED(DISABLED_FEATURES, "$DISABLED_FEATURES", [String of disabled features])
 
 if test "x$mono_feature_disable_aot" = "xyes"; then
-       AC_DEFINE(DISABLE_AOT, 1, [Disable AOT support])
-       AC_MSG_NOTICE([Disabled support for AOT])
+       AC_DEFINE(DISABLE_AOT_COMPILER, 1, [Disable AOT Compiler])
+       AC_MSG_NOTICE([Disabled AOT compiler])
 fi
 
 if test "x$mono_feature_disable_profiler" = "xyes"; then
@@ -2268,10 +2268,10 @@ AC_ARG_WITH(profile2,  [  --with-profile2=yes,no          If you want to install
        fi
 ])
 
-PROFILE4=yes
+PROFILE4=no
 AC_ARG_WITH(profile4,  [  --with-profile4=yes,no          If you want to install the 4.0 FX (defaults to yes)],[
-       if test x$with_profile4 = xno; then
-             PROFILE4=no
+       if test x$with_profile4 = xyes; then
+             PROFILE4=yes
        fi
 ])