X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=b7f322ac902f09ededddfbb3b0b89e32c95a010c;hb=5f5dff49570c2a37b595f54a3f25a79f6b5aef14;hp=5889bca36b7e957f8b8e16da2d74d74ecefd7b23;hpb=a2b6345a7b061b17bec21c35d95c0910244494e9;p=mono.git diff --git a/configure.in b/configure.in index 5889bca36b7..b7f322ac902 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.9) AM_MAINTAINER_MODE API_VER=1.0 @@ -212,7 +212,7 @@ case "$host" in ;; *-*-solaris*) platform_win32=no - CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP" + CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DPLATFORM_SOLARIS" need_link_unlink=yes libmono_cflags="-D_REENTRANT" libgc_threads=pthreads @@ -232,6 +232,9 @@ case "$host" in no_version_script=yes libdl= libgc_threads=pthreads + if test "x$cross_compiling" = "xyes"; then + has_broken_apple_cpp=yes + fi ;; *) AC_MSG_WARN([*** Please add $host to configure.in checks!]) @@ -300,7 +303,7 @@ fi AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes) -AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h) +AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h) AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no]) if test x$have_zlib = xyes; then @@ -406,6 +409,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]) @@ -440,12 +454,17 @@ AC_ARG_WITH([glib], [ --with-glib=embedded|system Choose glib API: system or embedded (default to system)], [], [with_glib=system]) +eglib_dir= + case $with_glib in embedded) - GLIB_CFLAGS='-I$(top_srcdir)/eglib/src' + GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src' 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" + eglib_dir=eglib AC_CONFIG_SUBDIRS(eglib) ;; system) @@ -473,6 +492,7 @@ AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) AC_SUBST(BUILD_GLIB_CFLAGS) AC_SUBST(BUILD_GLIB_LIBS) +AC_SUBST(eglib_dir) if test x$cross_compiling$platform_win32 = xnoyes; then AC_MSG_CHECKING(for cygwin glib2-dev package) @@ -712,6 +732,9 @@ dnl if test x$platform_win32 = xno; then + dnl hires monotonic clock support + AC_SEARCH_LIBS(clock_gettime, rt) + dnl dynamic loader support AC_CHECK_FUNC(dlopen, DL_LIB="", AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no) @@ -1280,11 +1303,13 @@ if test x$platform_win32 = xno; then 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))) + if text "x$has_broken_apple_cpp" != "xyes"; then + 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))) + fi AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h) AC_TRY_LINK([#include ], [ isfinite(0.0); ], @@ -1343,6 +1368,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) @@ -1412,7 +1467,7 @@ 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 ********************************* @@ -1441,6 +1496,7 @@ else 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 *** @@ -1588,6 +1644,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]) @@ -1719,14 +1776,22 @@ 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; JIT_SUPPORTED=yes jit_wanted=true ;; + arm*-darwin*) + TARGET=ARM; + arch_target=arm; + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" + jit_wanted=true + ;; arm*-linux*) TARGET=ARM; arch_target=arm; @@ -1897,7 +1962,7 @@ if test "x$with_tls" = "x__thread"; then ]) fi -if test ${TARGET} = ARM; then +if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then dnl ****************************************** dnl *** Check to see what FPU is available *** dnl ****************************************** @@ -1905,11 +1970,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" @@ -1932,13 +1993,27 @@ 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 ]) +OPROFILE=no +AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defaults to NO)],[ + if test x$with_oprofile != xno; then + OPROFILE=yes + OPROFILE_CFLAGS="-I$with_oprofile/include" + OPROFILE_LIBS= + AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support]) + fi +]) + +AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes) +AC_SUBST(OPROFILE_CFLAGS) +AC_SUBST(OPROFILE_LIBS) + libmono_ldflags="$libmono_ldflags $LIBS" AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes) @@ -1995,7 +2070,6 @@ AC_SUBST(mono_cfg_dir) AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper]) AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper]) -AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper]) AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config], [ depth=../../../.. @@ -2080,6 +2154,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 @@ -2141,12 +2216,12 @@ 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 echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make - case $INSTALL in [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;; *) mcs_INSTALL=$mono_build_root/$INSTALL ;; @@ -2157,17 +2232,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 @@ -2177,6 +2275,7 @@ echo " JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg + oprofile: $OPROFILE $disabled "