X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=bdce14589be2a7a4f9ded9784ae8de2c0a3e0d6a;hb=b30218afa2a50daedf0bbfa38bd292607e5948e6;hp=f88a7a5b077e34e719784d557e9039060b801e81;hpb=84969ab41912eacb953c6b5867b54d6ad900a326;p=mono.git diff --git a/configure.in b/configure.in index f88a7a5b077..bdce14589be 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono,1.2.4) +AM_INIT_AUTOMAKE(mono,1.2.5) AM_MAINTAINER_MODE API_VER=1.0 @@ -222,7 +222,7 @@ case "$host" in *-*-darwin*) platform_win32=no CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" - CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess" + CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent" libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" @@ -406,6 +406,17 @@ AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_bui AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) +# Where's the 'olive' source tree? +if test -d $srcdir/olive; then + olivedir=olive +else + olivedir=../olive +fi + +if test -d $srcdir/$olivedir; then +olive_topdir='$(top_srcdir)/'$olivedir +fi + AC_ARG_WITH([libgdiplus], [ --with-libgdiplus=installed|sibling| Override the libgdiplus used for System.Drawing tests (defaults to NO)], [], [with_libgdiplus=installed]) @@ -503,7 +514,7 @@ AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storag # 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=no]) +AC_ARG_WITH(sigaltstack, [ --with-sigaltstack=yes,no enable/disable support for sigaltstack],[],[with_sigaltstack=yes]) AC_ARG_WITH(static_mono, [ --with-static_mono=yes,no link mono statically to libmono (faster)],[],[with_static_mono=yes]) @@ -773,6 +784,9 @@ if test x$platform_win32 = xno; then AC_CHECK_FUNCS(mkstemp) AC_CHECK_FUNCS(mmap) AC_CHECK_FUNCS(madvise) + AC_CHECK_FUNCS(getrusage) + AC_CHECK_FUNCS(getpriority) + AC_CHECK_FUNCS(setpriority) AC_CHECK_FUNCS(sched_setaffinity) @@ -1437,6 +1451,7 @@ else AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?)) AC_CHECK_LIB(winmm, main, LIBS="$LIBS -lwinmm", AC_ERROR(bad mingw install?)) AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?)) + AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?)) dnl ********************************* dnl *** Check for struct ip_mreqn *** @@ -1715,8 +1730,8 @@ case "$host" in JIT_SUPPORTED=yes jit_wanted=true ;; - macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \ - powerpc-*-sysv* | powerpc-*-darwin*) + macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ + powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* ) TARGET=POWERPC; AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=ppc; @@ -1901,11 +1916,7 @@ if test ${TARGET} = ARM; then AC_TRY_COMPILE([], [ __asm__ ("ldfd f0, [r0]"); - ], fpu=FPA, [ - AC_TRY_COMPILE([], [ - __asm__ ("fldd d0, [r0]"); - ], fpu=VFP, fpu=NONE) - ]) + ], fpu=FPA, fpu=NONE) AC_MSG_RESULT($fpu) CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" @@ -1929,7 +1940,7 @@ AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 ]) MOONLIGHT=no -AC_ARG_WITH(moonlight,[ --with-moonligh=yes,no If you want to build the Moonlight 2.1 assemblies],[ +AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies],[ if test x$with_moonlight = xyes; then MOONLIGHT=yes fi @@ -2051,10 +2062,6 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini], AC_OUTPUT([ Makefile -mint.pc -mono.pc -mono-cairo.pc -dotnet.pc mono-uninstalled.pc scripts/mono-nunit.pc scripts/mono-find-provides @@ -2080,6 +2087,7 @@ mono/arch/mips/Makefile mono/interpreter/Makefile mono/tests/Makefile mono/tests/tests-config +mono/tests/assemblyresolve/Makefile mono/tests/cas/Makefile mono/tests/cas/assembly/Makefile mono/tests/cas/demand/Makefile @@ -2100,6 +2108,11 @@ docs/Makefile data/Makefile data/net_1_1/Makefile data/net_2_0/Makefile +data/mint.pc +data/mono.pc +data/mono-cairo.pc +data/dotnet.pc +data/cecil.pc samples/Makefile support/Makefile data/config @@ -2152,17 +2165,40 @@ fi export VERSION [myver=$($AWK 'BEGIN { split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".") + if(length(vsplit [1]) > 4) { + split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".") + } print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] }')] echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make fi + + # if we have an olive folder, override the default settings + if test -d $olivedir; then + + test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build + + if test x$cross_compiling = xno && test x$enable_olive_build != xno; then + echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make + echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make + echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make + echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make + echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make + echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make + if test x$with_moonlight = xyes; then + echo "WITH_MOONLIGHT = yes" >> $srcdir/$olivedir/build/config.make + fi + fi + fi ) libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} echo " - mcs source: $mcs_topdir + mcs source: $mcs_topdir + olive source: $olive_topdir + GC: $gc TLS: $with_tls SIGALTSTACK: $with_sigaltstack