X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=64c21952769c3bcc6d12e172056792c53e591d47;hb=6de415adc31ec9c2d1a74bc5240ee3d82ed6ee6f;hp=dd382112ce761d851ffd0f5d474f933682b88b82;hpb=e4cdfa72bb3a5f27aff221564d0e40524c3a903f;p=mono.git diff --git a/configure.in b/configure.in index dd382112ce7..64c21952769 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ AC_INIT(README) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono, 0.8) +AM_INIT_AUTOMAKE(mono, 0.10) AM_MAINTAINER_MODE AC_CHECK_TOOL(CC, gcc, gcc) @@ -28,7 +28,10 @@ AC_HEADER_STDC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL -AC_CHECK_HEADERS(sys/filio.h sys/sockio.h) +AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h) + +# for mono/metadata/debug-symfile.c +AC_CHECK_HEADERS(elf.h) # not 64 bit clean in cross-compile AC_CHECK_SIZEOF(void *, 4) @@ -75,6 +78,35 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) +AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes") +gc=none +AC_ARG_WITH(gc, [ --with-gc=boehm,none],[gc=$with_gc]) + +case "x$gc" in + xboehm|xyes) + if test "x$found_boehm" != "xyes"; then + AC_MSG_ERROR("GC requested but libgc not found!") + fi + + AC_DEFINE(HAVE_BOEHM_GC) + AC_SUBST(HAVE_BOEHM_GC) + LIBS="$LIBS -lgc" + ;; + *) +dnl When the JIT works with libgc, use this chunk. +dnl # If libgc was found, use it. Otherwise just warn. + if test "x$found_boehm" != "xyes"; then + AC_MSG_WARN("Compiling mono without GC.") + else + AC_DEFINE(HAVE_BOEHM_GC) + AC_SUBST(HAVE_BOEHM_GC) + LIBS="$LIBS -lgc" + gc="boehm" + fi +dnl AC_MSG_WARN("Compiling mono without GC.") + ;; +esac + dnl **************************************** dnl *** Check if we're building on win32 *** dnl **************************************** @@ -91,23 +123,6 @@ esac AC_MSG_RESULT($platform_win32) AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) -if test x$platform_win32 = xyes; then - AC_MSG_CHECKING([if building for native Win32]) - case "$host" in - *-*-mingw*) - platform_win32_native=yes - AC_DEFINE(PLATFORM_WIN32_NATIVE) - ;; - *) - platform_win32_native=no - ;; - esac - AC_MSG_RESULT($platform_win32_native) - AM_CONDITIONAL(PLATFORM_WIN32_NATIVE, - test x$platform_win32_native = xyes) -fi - - if test x$platform_win32 = xno; then dnl ****************************************************************** dnl *** Check for large file support *** @@ -205,34 +220,6 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT(no) ]) - dnl ************************************ - dnl *** Checks for IP_ADD_MEMBERSHIP *** - dnl ************************************ - AC_MSG_CHECKING(for IP_ADD_MEMBERSHIP) - AC_TRY_COMPILE([#include ], [ - int level = IP_ADD_MEMBERSHIP; - ], [ - # Yes, we have it... - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_IP_ADD_MEMBERSHIP) - ], [ - AC_MSG_RESULT(no) - ]) - - dnl ************************************* - dnl *** Checks for IP_DROP_MEMBERSHIP *** - dnl ************************************* - AC_MSG_CHECKING(for IP_DROP_MEMBERSHIP) - AC_TRY_COMPILE([#include ], [ - int level = IP_DROP_MEMBERSHIP; - ], [ - # Yes, we have it... - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_IP_DROP_MEMBERSHIP) - ], [ - AC_MSG_RESULT(no) - ]) - dnl ********************************* dnl *** Check for struct ip_mreqn *** dnl ********************************* @@ -343,8 +330,79 @@ if test x$platform_win32 = xno; then dnl *** Checks for semaphore lib *** dnl ******************************** AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt") +else + # This is a kludge, we really ought to test for libws2_32, but + # I can't make AC_CHECK_LIB link (the symbols seem to be mangled + # with @num suffixes) + LIBS="$LIBS -lws2_32" + CFLAGS="$CFLAGS -mno-cygwin" fi +dnl **************************** +dnl *** Look for /dev/random *** +dnl **************************** + +AC_MSG_CHECKING([if usage of random device is requested]) +AC_ARG_ENABLE(dev-random, +[ --disable-dev-random disable the use of the random device], +try_dev_random=$enableval, try_dev_random=yes) +AC_MSG_RESULT($try_dev_random) + +case "{$target}" in + *-openbsd*) + NAME_DEV_RANDOM="/dev/srandom" + ;; + +dnl Win32 does not have /dev/random, they have their own method... + + *-*-mingw*|*-*-cygwin*) + ac_cv_have_dev_random = no + ;; + +dnl Everywhere else, it's /dev/random + + *) + NAME_DEV_RANDOM="/dev/random" + ;; +esac + +AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM") + +dnl Now check if the device actually exists + +if test "x$try_dev_random" = "xyes"; then + AC_CACHE_CHECK(for random device, ac_cv_have_dev_random, + [if test -r "$NAME_DEV_RANDOM" ; then + ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi]) + if test "x$ac_cv_have_dev_random" = "xyes"; then + AC_DEFINE(HAVE_CRYPT_RNG) + fi +else + AC_MSG_CHECKING(for random device) + ac_cv_have_dev_random=no + AC_MSG_RESULT(has been disabled) +fi + +if test "x$platform_win32" = "xyes"; then + AC_DEFINE(HAVE_CRYPT_RNG) +fi + +if test "x$ac_cv_have_dev_random" = "xno" \ + && test "x$platform_win32" = "xno"; then + AC_MSG_WARN([[ +*** +*** A system-provided entropy source was not found on this system. +*** Because of this, the System.Security.Cryptography random number generator +*** will throw a NotImplemented exception. +*** +*** If you are seeing this message, and you know your system DOES have an +*** entropy collection in place, please contact and +*** provide information about the system and how to access the random device. +*** +*** For those systems who lack a random device, EGD support is forthcoming. +***]]) +fi + if test "x$cross_compiling" = "xno"; then # check for new iconv version AC_MSG_CHECKING(for new iconv) @@ -376,7 +434,7 @@ sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";; #alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";; #m68k-*-linux*) TARGET=M68K;; powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;; -#arm-*-linux-*) TARGET=ARM; ACCESS_UNALIGNED="no";; +arm-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";; esac if test ${TARGET} = unknown; then @@ -403,6 +461,7 @@ AC_SUBST(CFLAGS) AC_OUTPUT([ Makefile mono/Makefile +mono/utils/Makefile mono/metadata/Makefile mono/dis/Makefile mono/cil/Makefile @@ -410,10 +469,12 @@ mono/arch/Makefile mono/arch/x86/Makefile mono/arch/ppc/Makefile mono/arch/sparc/Makefile +mono/arch/arm/Makefile mono/interpreter/Makefile mono/tests/Makefile mono/wrapper/Makefile mono/monoburg/Makefile +mono/monograph/Makefile mono/jit/Makefile mono/io-layer/Makefile runtime/Makefile @@ -421,3 +482,9 @@ scripts/Makefile man/Makefile doc/Makefile ]) + +echo " + + GC: $gc + +"