X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e721806cbbd203ef7d23ceed3936bbb21e649d2c;hb=b4d6a3fb5b52123cce2c8291cbf0381b4b15d12b;hp=4722d125a3b06a02972677aea1f0a45a1c792e21;hpb=8f8ff8fba5a41d71a7cfb7eb593efbd5ebe16074;p=mono.git diff --git a/configure.in b/configure.in index 4722d125a3b..e721806cbbd 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,11 @@ AC_INIT(README) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono,0.95) +AM_INIT_AUTOMAKE(mono,1.1.1) AM_MAINTAINER_MODE +AC_PROG_LN_S + dnl dnl libgc checks dnl @@ -40,7 +42,7 @@ case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32]) - CC="gcc -mno-cygwin" + CC="gcc -mno-cygwin -g" HOST_CC="gcc" # So libgc configure gets -mno-cygwin export CC @@ -49,9 +51,10 @@ case "$host" in CPPFLAGS="$CPPFLAGS -DWIN32_THREADS" libdl= libgc_threads=win32 - gc_default=boehm - with_nptl=no + gc_default=included + with_nptl=default with_sigaltstack=no + LN_S=cp ;; *-*-*netbsd*) @@ -64,7 +67,62 @@ case "$host" in libdl= libgc_threads=no ;; - *-*-*freebsd*|*-*-*openbsd*) +# these flags will work for all versions of -STABLE +# + *-*-*freebsd4*) + platform_win32=no + if test "x$PTHREAD_CFLAGS" = "x"; then + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS" + libmono_cflags="-D_THREAD_SAFE" + else + CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS" + libmono_cflags="$PTHREAD_CFLAGS" + fi + if test "x$PTHREAD_LIBS" = "x"; then + LDFLAGS="$LDFLAGS -pthread" + libmono_ldflags="-pthread" + else + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" + libmono_ldflags="$PTHREAD_LIBS" + fi + need_link_unlink=yes + AC_DEFINE(PTHREAD_POINTER_ID) + libdl= + libgc_threads=pthreads +# TLS isn't implemented at all on -STABLE + with_nptl=no + with_tls=pthread + ;; +# older versions of -CURRENT will break with these flags but testing +# indicates these older versions won't run Mono anyway +# + *-*-*freebsd5*) + platform_win32=no + if test "x$PTHREAD_CFLAGS" = "x"; then + CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" + libmono_cflags= + else + CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS" + libmono_cflags="$PTHREAD_CFLAGS" + fi + if test "x$PTHREAD_LIBS" = "x"; then + LDFLAGS="$LDFLAGS -lpthread" + libmono_ldflags="-lpthread" + else + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" + libmono_ldflags="$PTHREAD_LIBS" + fi + need_link_unlink=yes + AC_DEFINE(PTHREAD_POINTER_ID) + libdl= + libgc_threads=pthreads +# TLS is only partially implemented on -CURRENT (compiler support +# but NOT library support) +# + with_nptl=no + with_tls=pthread + ;; + *-*-*openbsd*) platform_win32=no CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS" libmono_cflags="-D_THREAD_SAFE" @@ -173,9 +231,6 @@ AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes) AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h) -# for mono/mini/tramp-x86.c -AC_CHECK_HEADERS(valgrind/memcheck.h) - # for mono/metadata/debug-symfile.c AC_CHECK_HEADERS(elf.h) @@ -243,14 +298,27 @@ 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. +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],[ @@ -262,6 +330,7 @@ AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno) LIBGC_CFLAGS= LIBGC_LIBS= +LIBGC_STATIC_LIBS= libgc_dir= case "x$gc" in xboehm|xbohem|xyes) @@ -278,6 +347,7 @@ case "x$gc" in AC_DEFINE(HAVE_BOEHM_GC) AC_SUBST(HAVE_BOEHM_GC) LIBGC_LIBS="-lgc $libdl" + LIBGC_STATIC_LIBS="$LIBGC_LIBS" # AC_CHECK_FUNCS does not work for some reason... AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl) @@ -300,6 +370,7 @@ case "x$gc" in LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include' LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la' + LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la' AC_DEFINE(HAVE_BOEHM_GC) AC_SUBST(HAVE_BOEHM_GC) @@ -327,6 +398,7 @@ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) AC_SUBST(LIBGC_CFLAGS) AC_SUBST(LIBGC_LIBS) +AC_SUBST(LIBGC_STATIC_LIBS) AC_SUBST(libgc_dir) dnl @@ -395,6 +467,7 @@ if test x$platform_win32 = xno; then AC_CHECK_FUNCS(getpwuid_r) AC_CHECK_FUNCS(getresuid) AC_CHECK_FUNCS(setresuid) + AC_CHECK_FUNCS(kqueue) dnl ****************************************************************** dnl *** Check for large file support *** @@ -637,7 +710,17 @@ if test x$platform_win32 = xno; then dnl ***************************** dnl *** Checks for libpthread *** dnl ***************************** - AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread") +# on FreeBSD -STABLE, the pthreads functions all reside in libc_r +# and libpthread does not exist +# + case "${host}" in + *-*-*freebsd4*) + AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread") + ;; + *) + AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread") + ;; + esac AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_mutex_timedlock) AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np) @@ -658,7 +741,7 @@ if test x$platform_win32 = xno; then 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([ @@ -692,9 +775,9 @@ if test x$platform_win32 = xno; then } ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KW_THREAD) ], [ AC_MSG_RESULT(no) + with_tls=pthread ]) fi @@ -904,6 +987,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 ], [ + 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 ], [ + 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 @@ -921,9 +1032,22 @@ ac_cv_c_socklen_t=yes AC_MSG_RESULT(no) ]) +AC_MSG_CHECKING(for array element initalizer support) +AC_TRY_COMPILE([#include ], [ + const int array[] = {[1] = 2,}; +], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_ARRAY_ELEM_INIT,1,[Supports C99 array initialization]) +], [ + # We'll have to use signals + AC_MSG_RESULT(no) +]) + 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 ], - [ trunc(0.0); ], + [ static void *p = &trunc; ], [ AC_DEFINE(HAVE_TRUNC) AC_MSG_RESULT(yes) @@ -1044,6 +1168,7 @@ ACCESS_UNALIGNED="yes" JIT_SUPPORTED=no LIBC="libc.so.6" +INTL="libc.so.6" jit_wanted=false case "$host" in @@ -1060,20 +1185,28 @@ case "$host" in x86_64-*-* | amd64-*-*) TARGET=AMD64; arch_target=amd64; - JIT_SUPPORTED=no + JIT_SUPPORTED=yes + jit_wanted=true ;; 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; @@ -1093,6 +1226,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; @@ -1111,6 +1249,12 @@ case "$host" in ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes ;; + s390x-*-linux*) + TARGET=S390x; + arch_target=s390x; + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + ;; esac AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts that default to the JIT],[ @@ -1137,13 +1281,54 @@ case "$host" in powerpc-*-darwin*) libsuffix=".dylib" LIBC="libc.dylib" + INTL="libintl.dylib" ;; *-*-*netbsd*) LIBC="libc.so.12" + INTL="libintl.so.0" + ;; + *-*-*freebsd*) + LIBC="libc.so" + INTL="libintl.so" + ;; + *-*-*openbsd*) + LIBC="libc.so" + INTL="libintl.so" ;; esac AC_SUBST(libsuffix) +if test "x$TARGET" != "xAMD64"; then + # valgrind headers don't compile under x86-64 + AC_CHECK_HEADERS(valgrind/memcheck.h) +fi + +if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then + if test "x$with_tls" = "x__thread"; then + # + # On some linux distributions, TLS works in executables, but linking + # against a shared library containing TLS fails with: + # undefined reference to `__tls_get_addr' + # + rm -f conftest.c conftest.so conftest + echo "static __thread int foo; void main () { foo = 5; }" > conftest.c + gcc -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1 + gcc -o conftest conftest.so > /dev/null 2>&1 + if test ! -f conftest; then + AC_MSG_WARN([Disabling usage of __thread.]); + with_tls=pthread + fi + rm -f conftest.c conftest.so conftest + fi +fi + +if test "x$with_tls" = "x__thread"; then + AC_DEFINE(HAVE_KW_THREAD) + # Pass the information to libgc + CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS" + export CPPFLAGS +fi + if test ${TARGET} = ARM; then dnl ****************************************** dnl *** Check to see what FPU is available *** @@ -1184,6 +1369,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) @@ -1192,11 +1378,13 @@ AM_CONDITIONAL(M68K, test x$TARGET = xM68K) AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC) AM_CONDITIONAL(ARM, test x$TARGET = xARM) AM_CONDITIONAL(S390, test x$TARGET = xS390) +AM_CONDITIONAL(S390x, test x$TARGET = xS390x) 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) @@ -1222,6 +1410,7 @@ mono/arch/hppa/Makefile mono/arch/ppc/Makefile mono/arch/sparc/Makefile mono/arch/s390/Makefile +mono/arch/s390x/Makefile mono/arch/arm/Makefile mono/arch/alpha/Makefile mono/interpreter/Makefile @@ -1243,6 +1432,8 @@ man/Makefile web/Makefile docs/Makefile data/Makefile +data/net_1_1/Makefile +data/net_2_0/Makefile samples/Makefile support/Makefile data/config @@ -1255,7 +1446,7 @@ echo " GC: $gc ICU: $enable_icu - NPTL: $with_nptl + TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status 2.0 Alpha: $PREVIEW