X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=b3dd0121f139e6de2d2800063dd0e65040c42d44;hb=b60f7e3b1e6ccc692804bb2237e94faa816ab20a;hp=671886ef9cb16bcb3d7fc059cb8f6b216fe174ac;hpb=90000ff9514c47a67201df90eb232bb1a8054917;p=mono.git diff --git a/configure.in b/configure.in index 671886ef9cb..b3dd0121f13 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,23 @@ AC_INIT(README) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono,0.24) +AM_INIT_AUTOMAKE(mono,0.29) AM_MAINTAINER_MODE +dnl +dnl libgc checks +dnl + +gc_headers=no +gc=included +use_included_gc=no + +if test -d $srcdir/libgc ; then + gc_default=included +else + gc_default=boehm +fi + # # These are the flags that need to be stored in the mono.pc file for # compiling code that will embed Mono @@ -22,9 +36,12 @@ case "$host" in AC_DEFINE(PLATFORM_WIN32) CC="gcc -mno-cygwin" HOST_CC="gcc" - CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS" +# latest libgc already defines GC_WIN32_THREADS +# CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS" + CPPFLAGS="$CPPFLAGS -DWIN32_THREADS" libdl= libgc_threads=win32 + gc_default=boehm ;; *-*-*netbsd*) platform_win32=no @@ -55,12 +72,22 @@ case "$host" in libdl="-ldl" libgc_threads=pthreads ;; + *-*-hpux*) + platform_win32=no + CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT" + CFLAGS="$CFLAGS +ESdbgasm" + LDFLAGS="$LDFLAGS -z" + libmono_cflags="-D_REENTRANT" + libmono_ldflags="-lpthread" + libgc_threads=pthreads + AC_DEFINE(NEED_LINK_UNLINK) + ;; *-*-solaris*) platform_win32=no CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT" AC_DEFINE(NEED_LINK_UNLINK) libmono_cflags="-D_REENTRANT" - libgc_threads=solaris + libgc_threads=pthreads ;; *-*-darwin*) platform_win32=no @@ -72,6 +99,7 @@ case "$host" in AC_DEFINE(PTHREAD_POINTER_ID) libdl= libgc_threads=no + gc_default=none ;; *) AC_MSG_WARN([*** Please add $host to configure.in checks!]) @@ -86,6 +114,12 @@ AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC AM_PROG_CC_STDC AC_PROG_INSTALL +dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4 +: ${CCAS='$(CC)'} +# Set ASFLAGS if not already set. +: ${CCASFLAGS='$(CFLAGS)'} +AC_SUBST(CCAS) +AC_SUBST(CCASFLAGS) AC_CHECK_PROG(BISON, bison,yes,no) if test "x$BISON" = "xno"; @@ -113,6 +147,9 @@ AM_PROG_LIBTOOL 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) @@ -122,7 +159,21 @@ AC_CHECK_HEADERS(wchar.h) # not 64 bit clean in cross-compile AC_CHECK_SIZEOF(void *, 4) -CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' +WARN='' +if test x"$GCC" = xyes; then + WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' + # The runtime code does not respect ANSI C strict aliasing rules + CFLAGS="$CFLAGS -fno-strict-aliasing" +else + # The Sun Forte compiler complains about inline functions that access static variables + # so disable all inlining. + case "$host" in + *-*-solaris*) + CFLAGS="$CFLAGS -Dinline=" + ;; + esac +fi +CFLAGS="$CFLAGS -g $WARN" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then @@ -131,8 +182,8 @@ fi dnl for use on the build system dnl pkg-config is stupid -BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0` -BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0` +BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` +BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` AC_SUBST(BUILD_GLIB_CFLAGS) AC_SUBST(BUILD_GLIB_LIBS) @@ -154,8 +205,8 @@ GLIB_REQUIRED_VERSION=1.3.11 PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) -GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0` -GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0` +GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` +GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0` GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0` @@ -164,25 +215,31 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) -dnl -dnl libgc checks -dnl +AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default]) -AC_CONFIG_SUBDIRS(libgc) +# 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 Enable support for NPTL]) -gc_headers=no -AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes) -AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl) -gc=included -use_included_gc=no -AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc]) +# assembly bundle support, see metadata/make-bundle.pl for more info +AC_ARG_WITH(bundle, [ --with-bundle=bundle_template],[ + BUNDLE_FILE=$with_bundle + AC_SUBST(BUNDLE_FILE) + AC_DEFINE(WITH_BUNDLE) +],[with_bundle=no]) +AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno) LIBGC_CFLAGS= LIBGC_LIBS= +libgc_dir= case "x$gc" in xboehm|xbohem|xyes) + AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes) + AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl) + if test "x$found_boehm" != "xyes"; then - AC_MSG_ERROR("GC requested but libgc not found!") + AC_MSG_ERROR("GC requested but libgc not found! Install libgc or run configure with --with-gc=none.") fi if test "x$gc_headers" != "xyes"; then AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.") @@ -191,44 +248,43 @@ case "x$gc" in AC_DEFINE(HAVE_BOEHM_GC) AC_SUBST(HAVE_BOEHM_GC) LIBGC_LIBS="-lgc $libdl" + + # AC_CHECK_FUNCS does not work for some reason... + AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl) + if test "x$found_gcj_malloc" = "xyes"; then + AC_DEFINE(HAVE_GC_GCJ_MALLOC) + fi ;; xincluded) + AC_CONFIG_SUBDIRS(libgc) + found_boehm=yes gc_headers=yes use_included_gc=yes + libgc_dir=libgc LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include' - LIBGC_LIBS='$(top_builddir)/libgc/libgc.la' + LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la' AC_DEFINE(HAVE_BOEHM_GC) - AC_DEFINE(USE_INCLUDED_LIBGC) AC_SUBST(HAVE_BOEHM_GC) + + AC_DEFINE(HAVE_GC_H) + AC_DEFINE(USE_INCLUDED_LIBGC) + + # The included libgc contains GCJ support + AC_DEFINE(HAVE_GC_GCJ_MALLOC) ;; xnone) AC_MSG_WARN("Compiling mono without GC.") ;; *) - # If libgc was found, use it. Otherwise just warn. - if test "x$found_boehm" != "xyes"; then - AC_MSG_WARN("Compiling mono without GC.") - else - if test "x$gc_headers" != "xyes"; then - AC_MSG_ERROR("Found libgc but not its header files! You may need to install them by hand.") - fi - AC_DEFINE(HAVE_BOEHM_GC) - AC_SUBST(HAVE_BOEHM_GC) - LIBS="$LIBS -lgc $libdl" - gc="boehm" - fi + AC_MSG_ERROR([Invalid argument to --with-gc.]) ;; esac -if test "x$gc" = xboehm; then - AC_CHECK_FUNCS(GC_gcj_malloc) -fi - we_are_embedded_in_mono=yes export we_are_embedded_in_mono export libgc_threads @@ -236,6 +292,7 @@ export libgc_threads AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) AC_SUBST(LIBGC_CFLAGS) AC_SUBST(LIBGC_LIBS) +AC_SUBST(libgc_dir) dnl dnl End of libgc checks @@ -324,6 +381,21 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT(no) ]) + dnl ***************************** + dnl *** Checks for SOL_IPV6 *** + dnl ***************************** + AC_MSG_CHECKING(for SOL_IPV6) + AC_TRY_COMPILE([#include ], [ + int level = SOL_IPV6; + ], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SOL_IPV6) + ], [ + # We'll have to use getprotobyname + AC_MSG_RESULT(no) + ]) + dnl ***************************** dnl *** Checks for SOL_TCP *** dnl ***************************** @@ -365,8 +437,32 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_STRUCT_IP_MREQN) ], [ - # We'll just have to use struct ip_mreq + # 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) + ]) + ]) + + dnl ********************************** + dnl *** Check for gethostbyname2_r *** + dnl ********************************** + AC_MSG_CHECKING(for gethostbyname2_r) + AC_TRY_LINK([#include ], [ + gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL); + ], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GETHOSTBYNAME2_R) ]) dnl ***************************** @@ -400,6 +496,23 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT($cv_mono_sizeof_sunpath) AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath) + dnl ************************************* + dnl *** Checks for zero length arrays *** + dnl ************************************* + AC_MSG_CHECKING(whether $CC supports zero length arrays) + AC_TRY_COMPILE([ + struct s { + int length; + char data [0]; + }; + ], [], [ + AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0) + ], [ + AC_MSG_RESULT(no) + AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1) + ]) + dnl ***************************** dnl *** Checks for libxnet *** dnl ***************************** @@ -426,6 +539,7 @@ if test x$platform_win32 = xno; then dnl *** Checks for libpthread *** dnl ***************************** AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread") + AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_mutex_timedlock) AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE) AC_TRY_COMPILE([ #include ], [ @@ -438,11 +552,59 @@ if test x$platform_win32 = xno; then AC_MSG_WARN(Using mono_mutex_t for recursive mutexes) AC_DEFINE(USE_MONO_MUTEX) ]) + AC_CHECK_FUNCS(pthread_attr_setstacksize) + + dnl *********************************** + dnl *** Checks for working __thread *** + dnl *********************************** + AC_MSG_CHECKING(for working __thread) + AC_TRY_RUN([ + #include + + __thread int i; + static int res1, res2; + + void thread_main (void *arg) + { + i = arg; + sleep (1); + if (arg == 1) + res1 = (i == arg); + else + res2 = (i == arg); + } + + int main () { + pthread_t t1, t2; + + i = 5; + + pthread_create (&t1, NULL, thread_main, 1); + pthread_create (&t2, NULL, thread_main, 2); + + pthread_join (t1, NULL); + pthread_join (t2, NULL); + + return !(res1 + res2 == 2); + } + ], [ + if test "x$with_nptl" = "x"; then + AC_MSG_RESULT(disabled) + else + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KW_THREAD) + fi + ], [ + AC_MSG_RESULT(no) + ]) dnl ******************************** dnl *** Checks for semaphore lib *** dnl ******************************** - AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt") + # 'Real Time' functions on Solaris + # posix4 on Solaris 2.6 + # pthread (first!) on Linux + AC_SEARCH_LIBS(sem_init, pthread rt posix4) dnl ******************************** dnl *** Checks for timezone stuff ** @@ -469,6 +631,40 @@ if test x$platform_win32 = xno; then AC_ERROR(unable to find a way to determine timezone) fi fi + + dnl ********************************* + dnl *** Checks for math functions *** + dnl ********************************* + LIBS="$LIBS -lm"; + AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h) + AC_TRY_LINK([#include ], + [ finite(0.0); ], + AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) + AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h) + AC_TRY_LINK([#include ], + [ isfinite(0.0); ], + AC_DEFINE(HAVE_ISFINITE) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) + + dnl **************************************************************** + dnl *** Checks for working poll() (macosx defines it but doesn't *** + dnl *** have it in the library (duh)) *** + dnl **************************************************************** + AC_CHECK_FUNCS(poll) + + dnl ************************* + dnl *** Check for signbit *** + dnl ************************* + AC_MSG_CHECKING(for signbit) + AC_TRY_LINK([#include ], [ + int s = signbit(1.0); + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SIGNBIT) + ], [ + AC_MSG_RESULT(no) + ]) else 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?)) @@ -547,22 +743,101 @@ if test "x$try_shared_handles" != "xyes"; then AC_SUBST(DISABLE_SHARED_HANDLES) fi +ICU_CFLAGS="" +ICU_LIBS="" +enable_icu=no +AC_PATH_PROG(ICU_CONFIG, icu-config, no) +if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then + AC_MSG_WARN([Only invariant locale available; install ICU for I18N support]) +else + enable_icu="yes. Version: `$ICU_CONFIG --version`" + AC_DEFINE(HAVE_ICU) + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags` +fi +AC_SUBST(ICU_CFLAGS) +AC_SUBST(ICU_LIBS) + TARGET="unknown" ACCESS_UNALIGNED="yes" JIT_SUPPORTED=no +LIBC="libc.so.6" case "$host" in -#mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS; ACCESS_UNALIGNED="no";; -i*86-*-*) TARGET=X86; arch_target=x86; JIT_SUPPORTED=yes;; -sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";; -#alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";; -#m68k-*-linux*) TARGET=M68K;; -macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv* | powerpc-*-darwin*) TARGET=POWERPC; arch_target=ppc; JIT_SUPPORTED=yes;; -arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";; -s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";; +# mips-sgi-irix5.* | mips-sgi-irix6.*) +# TARGET=MIPS; +# ACCESS_UNALIGNED="no" +# ;; + i*86-*-*) + TARGET=X86; + arch_target=x86; + JIT_SUPPORTED=yes + ;; + sparc*-*-*) + TARGET=SPARC; + arch_target=sparc; + ACCESS_UNALIGNED="no" + ;; +# alpha*-*-linux* | alpha*-*-osf*) +# TARGET=ALPHA; +# ACCESS_UNALIGNED="no" +# ;; +# ia64-*-linux* | ia64-*-hpux*) +# TARGET=IA64; +# arch_target=ia64; +# JIT_SUPPORTED=no; +# ACCESS_UNALIGNED="no"; +# case "$host_os" in +# linux*) LIBC="libc.so.6.1";; +# hpux*) LIBC="libc.so.1";; +# esac +# ;; +# m68k-*-linux*) +# TARGET=M68K +# ;; + hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00) + TARGET=HPPA; + arch_target=hppa; + ACCESS_UNALIGNED="no" + ;; + macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \ + powerpc-*-sysv* | powerpc-*-darwin*) + TARGET=POWERPC; + arch_target=ppc; + JIT_SUPPORTED=yes + ;; + arm-*-linux-* | armv4l-*-linux-*) + TARGET=ARM; + arch_target=arm; + ACCESS_UNALIGNED="no" + ;; + s390-*-linux*) + TARGET=S390; + arch_target=s390; + ACCESS_UNALIGNED="no" + ;; esac +if test ${TARGET} = ARM; then + dnl ****************************************** + dnl *** Check to see what FPU is available *** + dnl ****************************************** + AC_MSG_CHECKING(which FPU to use) + + AC_TRY_COMPILE([], [ + __asm__ ("ldfd f0, [r0]"); + ], fpu=FPA, [ + AC_TRY_COMPILE([], [ + __asm__ ("fldd d0, [r0]"); + ], fpu=VFP, fpu=NONE) + ]) + + AC_MSG_RESULT($fpu) + CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu" + unset fpu +fi + if test ${TARGET} = unknown; then CPPFLAGS="$CPPFLAGS -DNO_PORT" AC_MSG_WARN("mono has not been ported to $host: some things may not work.") @@ -577,14 +852,15 @@ AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) AM_CONDITIONAL(X86, test x$TARGET = xX86) AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA) +AM_CONDITIONAL(IA64, test x$TARGET = xIA64) 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(HPPA, test x$TARGET = xHPPA) AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes) -LIBC="libc.so.6" AC_SUBST(LIBC) AC_SUBST(arch_target) @@ -605,6 +881,7 @@ mono/os/Makefile mono/os/win32/Makefile mono/os/unix/Makefile mono/arch/x86/Makefile +mono/arch/hppa/Makefile mono/arch/ppc/Makefile mono/arch/sparc/Makefile mono/arch/s390/Makefile @@ -612,24 +889,27 @@ mono/arch/arm/Makefile mono/arch/alpha/Makefile mono/interpreter/Makefile mono/tests/Makefile +mono/tests/tests-config mono/benchmark/Makefile mono/monoburg/Makefile mono/monograph/Makefile -mono/jit/Makefile mono/io-layer/Makefile mono/handles/Makefile mono/mini/Makefile +mono/profiler/Makefile runtime/Makefile scripts/Makefile man/Makefile doc/Makefile docs/Makefile data/Makefile +samples/Makefile +data/config mono.spec ]) echo " GC: $gc - + ICU: $enable_icu "