X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=7af857a0b9e074ceb92b82d9ce4b11731854fc25;hb=de69103ea6767af2d831fa49ccb796840ba882af;hp=ffce9351715df8b6dd133ef949f7fb0956c7732b;hpb=d1bb8e5ec10766d4fecdc634bf736385ff09c7ea;p=mono.git diff --git a/configure.in b/configure.in index ffce9351715..7af857a0b9e 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.9) AM_MAINTAINER_MODE API_VER=1.0 @@ -70,7 +70,8 @@ case "$host" in export CC fi HOST_CC="gcc" - CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024 -DUNICODE -D_UNICODE" + # Windows 2000 is required that includes Internet Explorer 5.01 + CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024" libmono_cflags="-mno-cygwin" libmono_ldflags="-mno-cygwin" libdl= @@ -212,7 +213,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 @@ -222,7 +223,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" @@ -232,6 +233,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!]) @@ -246,6 +250,7 @@ if test x$need_link_unlink = xyes; then fi AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) +AM_CONDITIONAL(PLATFORM_LINUX, test x$target_os = xlinux-gnu) AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC @@ -300,7 +305,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 +411,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 +456,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 +494,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) @@ -503,7 +525,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]) @@ -643,13 +665,6 @@ case "x$gc" in ;; xincluded) - AC_CONFIG_SUBDIRS(libgc) - - # Pass CPPFLAGS to libgc configure - # Maybe we should use a separate variable for this to avoid passing useless and - # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) - export CPPFLAGS - found_boehm=yes gc_headers=yes use_included_gc=yes @@ -697,9 +712,6 @@ if test "x$large_heap" = "xyes"; then CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG" fi -# tell libgc/configure about what we want -ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args" - AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) AC_SUBST(LIBGC_CFLAGS) AC_SUBST(LIBGC_LIBS) @@ -712,6 +724,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) @@ -773,6 +788,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) @@ -1277,11 +1295,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 test "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); ], @@ -1340,6 +1360,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) @@ -1409,7 +1459,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 ********************************* @@ -1437,6 +1487,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 *** @@ -1584,6 +1636,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]) @@ -1715,14 +1768,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; @@ -1893,7 +1954,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 ****************************************** @@ -1901,11 +1962,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" @@ -1921,6 +1978,17 @@ if test ${ACCESS_UNALIGNED} = no; then CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS" fi +case "x$gc" in + xincluded) + # Pass CPPFLAGS to libgc configure + # We should use a separate variable for this to avoid passing useless and + # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) + # This should be executed late so we pick up the final version of CPPFLAGS + ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\"" + AC_CONFIG_SUBDIRS(libgc) + ;; +esac + PREVIEW=yes 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 @@ -1928,13 +1996,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) @@ -1991,7 +2073,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=../../../.. @@ -2049,12 +2130,22 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini], cd $depth ],[LN_S='$LN_S']) +AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser], +[ depth=../../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/ + cd runtime/etc/mono/2.0/Browsers + rm -f Compat.browser + $LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser + 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 @@ -2080,6 +2171,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 +2192,12 @@ docs/Makefile data/Makefile data/net_1_1/Makefile data/net_2_0/Makefile +data/net_2_0/Browsers/Makefile +data/mint.pc +data/mono.pc +data/mono-cairo.pc +data/dotnet.pc +data/cecil.pc samples/Makefile support/Makefile data/config @@ -2136,12 +2234,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 ;; @@ -2152,17 +2250,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 @@ -2172,6 +2293,7 @@ echo " JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg + oprofile: $OPROFILE $disabled "