X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e6e687ea38a377501e33a3279041745ac4c85ea0;hb=3878cf2815e7cce9113f98c40b6a3a2333ff0941;hp=ad2e336ce6335400e20d575aa9b99acbdec75282;hpb=7bc2f969c6100ce8a865cfb39f4a62956c5fde2c;p=mono.git diff --git a/configure.in b/configure.in index ad2e336ce63..e6e687ea38a 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. #AC_PREREQ([2.62]) -AC_INIT(mono, [2.11.4], +AC_INIT(mono, [2.11.5], [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono]) AC_CONFIG_SRCDIR([README]) @@ -1125,20 +1125,14 @@ if test x$target_win32 = xno; then AC_DEFUN([LARGE_FILES], [ large_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $1" - AC_TRY_RUN([ + AC_TRY_COMPILE([ #include - - #define BIG_OFF_T (((off_t)1<<62)-1+((off_t)1<<62)) - - int main(void) { - int big_off_t=((BIG_OFF_T%2147483629==721) && - (BIG_OFF_T%2147483647==1)); - if(big_off_t) { - exit(0); - } else { - exit(1); - } - } + #include + ], [ + /* Lifted this compile time assert method from: http://www.jaggersoft.com/pubs/CVu11_3.html */ + #define COMPILE_TIME_ASSERT(pred) \ + switch(0){case 0:case pred:;} + COMPILE_TIME_ASSERT(sizeof(off_t) * CHAR_BIT == 64); ], [ AC_MSG_RESULT(ok) AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support]) @@ -1146,7 +1140,7 @@ if test x$target_win32 = xno; then large_offt=yes ], [ AC_MSG_RESULT(no) - ], "") + ]) CPPFLAGS=$large_CPPFLAGS ]) @@ -2818,11 +2812,12 @@ case "x$gc" in ;; esac -#AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0 FX (defaults to yes)], [], [with_profile2=yes]) -AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4=yes]) -AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid 2.1 assemblies (defaults to no)], [], [with_monodroid=no]) -AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no]) -AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile 2.1 assemblies (defaults to no)], [], [with_mobile=no]) +AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0/3.5 FX (defaults to yes)], [], [with_profile2=yes]) +AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to yes)], [], [with_profile4=yes]) +AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes]) +AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no]) +AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no]) +AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile assemblies (defaults to no)], [], [with_mobile=no]) OPROFILE=no AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defaults to no)],[ @@ -2886,7 +2881,7 @@ fi # When --disable-shared is used, libtool transforms libmono-2.0.la into libmono-2.0.so # instead of libmono-static.a if test "x$enable_shared" = "xno"; then - LIBMONO_LA=.libs/libmono-static.a + LIBMONO_LA=libmini-static.la else LIBMONO_LA=libmono-$API_VER.la fi @@ -2920,7 +2915,9 @@ AM_CONDITIONAL(ONLY_MOONLIGHT, [test "x$with_moonlight" = "xonly"]) AM_CONDITIONAL(MOONLIGHT_BOEHM, [test "x$with_moon_gc" = "xboehm"]) AM_CONDITIONAL(MOONLIGHT_SGEN, [test "x$with_moon_gc" = "xsgen"]) +AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes]) AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes]) +AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes]) AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" = xyes]) AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes]) AM_CONDITIONAL(INSTALL_MOBILE, [test "x$with_mobile" = xyes]) @@ -3280,10 +3277,22 @@ fi if test x$with_moonlight != xno; then echo "MOONLIGHT = 1" >> $srcdir/$mcsdir/build/config.make fi - - if test x$with_profile4 != xyes; then - echo "DEFAULT_PROFILE = net_2_0" >> $srcdir/$mcsdir/build/config.make + + default_profile=net_2_0 + if test -z "$INSTALL_4_0_TRUE"; then : + default_profile=net_4_0 + fi + if test -z "$INSTALL_MONODROID_TRUE"; then : + default_profile=monodroid fi + if test -z "$INSTALL_MONOTOUCH_TRUE"; then : + default_profile=monotouch + fi + if test -z "$INSTALL_4_5_TRUE"; then : + default_profile=net_4_5 + fi + + echo "DEFAULT_PROFILE = $default_profile" >> $srcdir/$mcsdir/build/config.make if test "x$test_bcl_opt" = "xyes"; then echo "BCL_OPTIMIZE = 1" >> $srcdir/$mcsdir/build/config.make @@ -3313,7 +3322,6 @@ libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} echo " mcs source: $mcsdir - olive source: $olive_topdir Engine: GC: $gc_msg @@ -3325,8 +3333,10 @@ echo " DTrace: $enable_dtrace LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) - Libraries: - Moon Profile: $with_moonlight ($with_moon_gc) + Libraries: + .NET 2.0/3.5: $with_profile2 + .NET 4.0: $with_profile4 + .NET 4.5: $with_profile4_5 MonoDroid: $with_monodroid MonoTouch: $with_monotouch Mobile: $with_mobile