Merge pull request #444 from knocte/xbuild_improvements

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index ba3d1a9aac02390035cd55dfb10d4a607bb614c6..38cc6dc29257fe25a36439284f0e9de7a4f29b00 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1125,19 +1125,18 @@ if test x$target_win32 = xno; then
        AC_DEFUN([LARGE_FILES], [
                large_CPPFLAGS=$CPPFLAGS
                CPPFLAGS="$CPPFLAGS $1"
-               AC_TRY_RUN([
+               AC_TRY_COMPILE([
                        #include <sys/types.h>
+                       #include <limits.h>
+               ], [
+                       /* 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:;}
 
-                       #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);
-                               }
+                       int main(void)
+                       {
+                               COMPILE_TIME_ASSERT(sizeof(off_t) * CHAR_BIT == 64);
+                               return 0;
                        }
                ], [
                        AC_MSG_RESULT(ok)
@@ -1146,7 +1145,7 @@ if test x$target_win32 = xno; then
                        large_offt=yes
                ], [
                        AC_MSG_RESULT(no)
-               ], "")
+               ])
                CPPFLAGS=$large_CPPFLAGS
        ])
 
@@ -3285,10 +3284,18 @@ fi
     fi
 
        default_profile=net_2_0
-    AM_COND_IF(INSTALL_4_0, default_profile=net_4_0)
-    AM_COND_IF(INSTALL_MONODROID, default_profile=monodroid)
-    AM_COND_IF(INSTALL_MONOTOUCH, default_profile=monotouch)
-    AM_COND_IF(INSTALL_4_5, default_profile=net_4_5)
+    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