X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=2de9c2bbe27c80c32238d33c47f94d5799970657;hb=5a0854e91b1a715b18c8da9df1308498043178ec;hp=a34e013ee65dad4f601366ae9728b80beb83193a;hpb=cb11326fc13eb84542558749bfdcf31817190c20;p=mono.git diff --git a/configure.in b/configure.in index a34e013ee65..2de9c2bbe27 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.5) +AM_INIT_AUTOMAKE(mono,1.2.6) AM_MAINTAINER_MODE API_VER=1.0 @@ -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]) @@ -446,6 +457,8 @@ embedded) GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm' BUILD_GLIB_CFLAGS="$GLIB_CFLAGS" BUILD_GLIB_LIBS="$GLIB_LIBS" + GMODULE_CFLAGS="$GLIB_CFLAGS" + GMODULE_LIBS="$GLIB_LIBS" AC_CONFIG_SUBDIRS(eglib) ;; system) @@ -774,6 +787,8 @@ if test x$platform_win32 = xno; then 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) @@ -1341,6 +1356,36 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT(no) ]) dnl ********************************** + dnl *** Checks for sin_len *** + dnl ********************************** + AC_MSG_CHECKING(for sockaddr_in.sin_len) + AC_TRY_COMPILE([ + #include + ], [ + struct sockaddr_in saddr; + saddr.sin_len = sizeof (saddr); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [sockaddr_in has sin_len]) + ], [ + AC_MSG_RESULT(no) + ]) + dnl ********************************** + dnl *** Checks for sin6_len *** + dnl ********************************** + AC_MSG_CHECKING(for sockaddr_in6.sin6_len) + AC_TRY_COMPILE([ + #include + ], [ + struct sockaddr_in6 saddr6; + saddr6.sin6_len = sizeof (saddr6); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SOCKADDR_IN6_SIN_LEN, 1, [sockaddr_in6 has sin6_len]) + ], [ + AC_MSG_RESULT(no) + ]) + dnl ********************************** dnl *** Checks for MonoPosixHelper *** dnl ********************************** AC_CHECK_HEADERS(checklist.h) @@ -1438,6 +1483,8 @@ 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?)) + AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?)) dnl ********************************* dnl *** Check for struct ip_mreqn *** @@ -1585,6 +1632,7 @@ if test "x$try_shared_handles" != "xyes"; then AC_SUBST(DISABLE_SHARED_HANDLES) fi + AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check']) AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes]) @@ -1716,8 +1764,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; @@ -1902,11 +1950,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,10 +1973,10 @@ AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 fi ]) -MOONLIGHT=no +MOONLIGHT=yes 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 + if test x$with_moonlight = xno; then + MOONLIGHT=no fi ]) @@ -2077,6 +2121,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 @@ -2138,6 +2183,7 @@ fi if test x$cross_compiling = xno && test x$enable_mcs_build != xno; then echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make + echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make @@ -2154,17 +2200,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