the runtime part of the intrinsic OffsetToStringData patch

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index ba1b732664fa5471922ed94f3d2e4692839f96da..6eb405ac558c117142c946265206b67c71e19db3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.96)
+AM_INIT_AUTOMAKE(mono,1.0)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -54,6 +54,7 @@ case "$host" in
                gc_default=boehm 
                with_nptl=no
                with_sigaltstack=no
+               LN_S=cp
 
                ;;
        *-*-*netbsd*)
@@ -245,14 +246,15 @@ AC_SUBST(GMODULE_LIBS)
 
 AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
 
-# Enable support for NPTL only features like fast thread-local storage
-# We can't reliably detect nptl at compile & run time
-# so this option will stay until nptl becomes more widespread
-AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for NPTL],[],[with_nptl=yes])
+# Enable support for fast thread-local storage
+# Some systems have broken support, so we allow to disable it.
+# This is misnamed: __thread support has no relation to NPTL,
+# but people already use it...
+AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for __thread support],[],[with_nptl=yes])
 
 # Enable support for using sigaltstack for SIGSEGV and stack overflow handling
 # This does not work on some platforms (bug #55253)
-AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=yes])
+AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=no])
 
 # assembly bundle support, see metadata/make-bundle.pl for more info
 AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
@@ -906,6 +908,34 @@ else
        jdk_headers_found=no
        AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
        AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
+
+       dnl *********************************
+       dnl *** Check for struct ip_mreqn ***
+       dnl *********************************
+       AC_MSG_CHECKING(for struct ip_mreqn)
+       AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+               struct ip_mreqn mreq;
+               mreq.imr_address.s_addr = 0;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_STRUCT_IP_MREQN)
+       ], [
+               # We'll just have to try and use struct ip_mreq
+               AC_MSG_RESULT(no)
+               AC_MSG_CHECKING(for struct ip_mreq)
+               AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+                       struct ip_mreq mreq;
+                       mreq.imr_interface.s_addr = 0;
+               ], [
+                       # Yes, we have it...
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+               ], [
+                       # No multicast support
+                       AC_MSG_RESULT(no)
+               ])
+       ])
 fi
 
 dnl socklen_t check
@@ -924,8 +954,9 @@ ac_cv_c_socklen_t=yes
 ])
 
 AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
+       # Simply calling trunc (0.0) is no good since gcc will optimize the call away
        AC_TRY_LINK([#include <math.h>], 
-       [ trunc(0.0); ], 
+       [ static void *p = &trunc; ],
        [
                AC_DEFINE(HAVE_TRUNC) 
                AC_MSG_RESULT(yes)
@@ -1046,6 +1077,7 @@ ACCESS_UNALIGNED="yes"
 
 JIT_SUPPORTED=no
 LIBC="libc.so.6"
+INTL="libc.so.6"
 
 jit_wanted=false
 case "$host" in
@@ -1065,17 +1097,24 @@ case "$host" in
                JIT_SUPPORTED=no
                ;;
        sparc*-*-*)
-               TARGET=SPARC;
+               if test "x$ac_cv_sizeof_void_p" = "x8"; then
+                  TARGET=SPARC64
+               else
+                       TARGET=SPARC
+               fi
                arch_target=sparc;
                JIT_SUPPORTED=yes
                ACCESS_UNALIGNED="no"
                LIBC="libc.so"
+               INTL="libintl.so"
                jit_wanted=true
                ;;
-#       alpha*-*-linux* | alpha*-*-osf*)
-#              TARGET=ALPHA;
-#              ACCESS_UNALIGNED="no"
-#             ;;
+       alpha*-*-linux* | alpha*-*-osf*)
+               TARGET=ALPHA;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=no
+               arch_target=alpha;
+              ;;
 #      ia64-*-linux* | ia64-*-hpux*)
 #              TARGET=IA64;
 #              arch_target=ia64;
@@ -1095,6 +1134,11 @@ case "$host" in
                LIBC="libc.sl"
                ACCESS_UNALIGNED="no"
                ;;
+       hppa*linux*)
+               TARGET=HPPA;
+               arch_target=hppa; 
+               ACCESS_UNALIGNED="no"
+               ;;
        macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
         powerpc-*-sysv* | powerpc-*-darwin*)
                TARGET=POWERPC;
@@ -1139,9 +1183,11 @@ case "$host" in
      powerpc-*-darwin*)
        libsuffix=".dylib"
        LIBC="libc.dylib"
+       INTL="libintl.dylib"
        ;;
      *-*-*netbsd*)
        LIBC="libc.so.12"
+       INTL="libintl.so.0"
        ;;
 esac
 AC_SUBST(libsuffix)
@@ -1186,6 +1232,7 @@ AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
 AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
 AM_CONDITIONAL(X86, test x$TARGET = xX86)
 AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
 AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
@@ -1199,6 +1246,7 @@ AM_CONDITIONAL(HPPA, test x$TARGET = xHPPA)
 AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
 
 AC_SUBST(LIBC)
+AC_SUBST(INTL)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
@@ -1257,7 +1305,7 @@ echo "
 
        GC:          $gc
        ICU:         $enable_icu
-       NPTL:        $with_nptl
+       __thread:    $with_nptl
        SIGALTSTACK: $with_sigaltstack
        Engine:      $jit_status
        2.0 Alpha:   $PREVIEW