X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=7ed7331e125ffca039421c5a1f87d32b900319ab;hb=831403d104705c81d2fdb98473855da2e3076311;hp=d16fc134d4527eead709b2763072fa2d4e834e67;hpb=8b46af95ffd7eefa44840bee8f041c3f9a08eec1;p=mono.git diff --git a/configure.in b/configure.in index d16fc134d45..7ed7331e125 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) +AM_INIT_AUTOMAKE(mono,1.2.5) AM_MAINTAINER_MODE API_VER=1.0 @@ -70,7 +70,7 @@ case "$host" in export CC fi HOST_CC="gcc" - CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024" + CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024 -DUNICODE -D_UNICODE" libmono_cflags="-mno-cygwin" libmono_ldflags="-mno-cygwin" libdl= @@ -83,14 +83,15 @@ case "$host" in ;; *-*-*netbsd*) platform_win32=no - CPPFLAGS="$CPPFLAGS -D_REENTRANT" + CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE" libmono_cflags="-D_REENTRANT" LDFLAGS="$LDFLAGS -pthread" CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes - libdl= - libgc_threads=no + libdl="-ldl" + libgc_threads=pthreads + with_sigaltstack=no ;; # these flags will work for all versions of -STABLE # @@ -221,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" @@ -248,6 +249,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC +AM_PROG_AS AM_PROG_CC_STDC AC_PROG_INSTALL AC_PROG_AWK @@ -404,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 $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]) @@ -501,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]) @@ -771,6 +784,11 @@ 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) dnl ****************************************************************** dnl *** Check for large file support *** @@ -1392,6 +1410,9 @@ if test x$platform_win32 = xno; then #include ]) AC_CHECK_TYPES([struct timezone], [AC_DEFINE(HAVE_STRUCT_TIMEZONE)], , [#include ]) + AC_CHECK_TYPES([struct utimbuf], [AC_DEFINE(HAVE_STRUCT_UTIMBUF)], , + [#include + #include ]) AC_CHECK_MEMBERS( [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, [#include @@ -1402,6 +1423,12 @@ if test x$platform_win32 = xno; then AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",) ) AC_SUBST(XATTR_LIB) + + dnl ********************************* + dnl *** Checks for Windows compilation *** + dnl ********************************* + AC_CHECK_HEADERS(sys/time.h) + AC_CHECK_HEADERS(sys/param.h) dnl ********************************* dnl *** Check for Console 2.0 I/O *** @@ -1422,7 +1449,9 @@ 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?)) 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 *** @@ -1607,6 +1636,10 @@ case "$host" in solaris*) LIBC="libc.so" INTL="libintl.so" + if test "x$ac_cv_sizeof_void_p" = "x8"; then + TARGET=AMD64 + arch_target=amd64 + fi # On solaris 10 x86, gcc prints a warning saying 'visibility attribute not supported on this configuration; ignored', but linking fails. A test case: # int astruct __attribute__ ((visibility ("hidden"))); @@ -1620,7 +1653,6 @@ case "$host" in # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally have_visibility_hidden=no - libmono_ldflags="$libmono_ldflags $LIBS" esac ;; x86_64-*-* | amd64-*-*) @@ -1654,7 +1686,6 @@ case "$host" in *) LIBC="libc.so" INTL="libintl.so" - libmono_ldflags="$libmono_ldflags $LIBS" esac jit_wanted=true if test x"$GCC" = xyes; then @@ -1693,13 +1724,14 @@ case "$host" in ;; hppa*linux*) TARGET=HPPA; + AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=hppa; ACCESS_UNALIGNED="no" - INTERP_SUPPORTED=yes - interp_wanted=true + 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; @@ -1884,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" @@ -1905,13 +1933,23 @@ if test ${ACCESS_UNALIGNED} = no; then fi PREVIEW=yes -AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 FX preview],[ +AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 FX preview],[ if test x$with_preview = xno; then PREVIEW=no fi ]) +MOONLIGHT=no +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 +]) + +libmono_ldflags="$libmono_ldflags $LIBS" + AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes) +AM_CONDITIONAL(INSTALL_2_1, test x$MOONLIGHT = xyes) AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) @@ -2008,12 +2046,22 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config], cd $depth ],[LN_S='$LN_S']) +AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini], +[ depth=../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/ + cd runtime/etc/mono/ + rm -f browscap.ini + $LN_S $reldir/data/browscap.ini browscap.ini + cd $depth +],[LN_S='$LN_S']) + AC_OUTPUT([ Makefile -mint.pc -mono.pc -mono-cairo.pc -dotnet.pc mono-uninstalled.pc scripts/mono-nunit.pc scripts/mono-find-provides @@ -2039,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 @@ -2059,12 +2108,18 @@ 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 tools/Makefile tools/locale-builder/Makefile runtime/Makefile +msvc/Makefile ]) if test x$platform_win32 = xyes; then @@ -2110,22 +2165,46 @@ 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 Engine: $jit_status - 2.0 Alpha: $PREVIEW + 2.0 Beta: $PREVIEW + 2.1 Alpha: $MOONLIGHT JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg