AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.93)
+AM_INIT_AUTOMAKE(mono,1.0)
AM_MAINTAINER_MODE
+AC_PROG_LN_S
+
dnl
dnl libgc checks
dnl
libdl=
libgc_threads=win32
gc_default=boehm
+ with_nptl=no
+ with_sigaltstack=no
+ LN_S=cp
+
;;
*-*-*netbsd*)
platform_win32=no
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.
+AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation],[],[with_tls=__thread])
+
+# Kept for compatibility
+AC_ARG_WITH(nptl, [ --with-nptl=yes,no deprecated, use --with-tls instead],[],[with_nptl=default])
+
+if test "x$with_nptl" != "xdefault"; then
+ if test "x$with_nptl" = "xyes"; then
+ AC_MSG_WARN([--with-nptl=yes is deprecated, use --with-tls=__thread option instead.])
+ with_tls=__thread
+ fi
+ if test "x$with_nptl" = "xno"; then
+ AC_MSG_WARN([--with-nptl=no is deprecated, use --with-tls=pthread option instead.])
+ with_tls=pthread
+ fi
+fi
# 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],[
dnl *** Checks for working __thread ***
dnl ***********************************
AC_MSG_CHECKING(for working __thread)
- if test "x$with_nptl" != "xyes"; then
+ if test "x$with_tls" != "x__thread"; then
AC_MSG_RESULT(disabled)
else
AC_TRY_RUN([
AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
fi
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
])
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)
dnl Win32 does not have /dev/random, they have their own method...
*-*-mingw*|*-*-cygwin*)
- ac_cv_have_dev_random = no
+ ac_cv_have_dev_random=no
;;
dnl Everywhere else, it's /dev/random
JIT_SUPPORTED=no
LIBC="libc.so.6"
+INTL="libc.so.6"
jit_wanted=false
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;
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;
powerpc-*-darwin*)
libsuffix=".dylib"
LIBC="libc.dylib"
+ INTL="libintl.dylib"
+ ;;
+ *-*-*netbsd*)
+ LIBC="libc.so.12"
+ INTL="libintl.so.0"
;;
esac
AC_SUBST(libsuffix)
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)
AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
AC_SUBST(LIBC)
+AC_SUBST(INTL)
AC_SUBST(arch_target)
AC_SUBST(CFLAGS)
GC: $gc
ICU: $enable_icu
- NPTL: $with_nptl
+ TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
Engine: $jit_status
2.0 Alpha: $PREVIEW
projects / mono.git / blobdiff