X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=b1b3b4b9fb504e7d524c6353ae1d89fce4114056;hb=b2b79df36de909cdaffaf7d5a1cc0f9184ef22a2;hp=180004307905727cf7e7924d79dce245e0ee25b4;hpb=50e21af3247970250b60090486f99e989e219e18;p=mono.git diff --git a/configure.in b/configure.in index 18000430790..b1b3b4b9fb5 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.1.8) +AM_INIT_AUTOMAKE(mono,1.1.15) AM_MAINTAINER_MODE AC_PROG_LN_S @@ -25,6 +25,7 @@ dnl gc_headers=no gc=included use_included_gc=no +libgc_configure_args= if test -d $srcdir/libgc ; then gc_default=included @@ -41,6 +42,11 @@ libmono_ldflags="" AC_SUBST(libmono_cflags) AC_SUBST(libmono_ldflags) +# Variable to have relocatable .pc files (lib, or lib64) +reloc_libdir=`basename ${libdir}` +AC_SUBST(reloc_libdir) + + dnl if linker handles the version script no_version_script=no @@ -54,12 +60,12 @@ case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32]) - CC="gcc -mno-cygwin -g" + if test "x$cross_compiling" = "xno"; then + CC="gcc -mno-cygwin -g" + # So libgc configure gets -mno-cygwin + export CC + fi HOST_CC="gcc" - # So libgc configure gets -mno-cygwin - export CC -# latest libgc already defines GC_WIN32_THREADS -# CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS" CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024" libdl= libgc_threads=win32 @@ -67,12 +73,15 @@ case "$host" in with_nptl=default with_sigaltstack=no LN_S=cp + # This forces libgc to use the DllMain based thread registration code on win32 + libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes" ;; *-*-*netbsd*) platform_win32=no CPPFLAGS="$CPPFLAGS -D_REENTRANT" libmono_cflags="-D_REENTRANT" LDFLAGS="$LDFLAGS -pthread" + CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes libdl= @@ -96,6 +105,7 @@ case "$host" in LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi + CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD4" need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) libdl= @@ -120,6 +130,7 @@ case "$host" in LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi + CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD5" need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) libdl= @@ -146,6 +157,7 @@ case "$host" in LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi + CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6" need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) libdl= @@ -169,7 +181,7 @@ case "$host" in ;; *-*-linux*) platform_win32=no - CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT" + CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP" libmono_cflags="-D_REENTRANT" libmono_ldflags="-lpthread" libdl="-ldl" @@ -187,14 +199,14 @@ case "$host" in ;; *-*-solaris*) platform_win32=no - CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" + CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP" need_link_unlink=yes libmono_cflags="-D_REENTRANT" libgc_threads=pthreads ;; *-*-darwin*) platform_win32=no - CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS" + CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX" libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" @@ -241,19 +253,25 @@ dnl may require a specific autoconf version dnl AC_PROG_CC_FOR_BUILD dnl CC_FOR_BUILD not automatically detected CC_FOR_BUILD=$CC +CFLAGS_FOR_BUILD=$CFLAGS BUILD_EXEEXT= if test "x$cross_compiling" = "xyes"; then CC_FOR_BUILD=cc + CFLAGS_FOR_BUILD= BUILD_EXEEXT="" fi AC_SUBST(CC_FOR_BUILD) +AC_SUBST(CFLAGS_FOR_BUILD) AC_SUBST(HOST_CC) AC_SUBST(BUILD_EXEEXT) +AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes]) + # Set STDC_HEADERS AC_HEADER_STDC AC_LIBTOOL_WIN32_DLL -AC_DISABLE_FAST_INSTALL +# This causes monodis to not link correctly +#AC_DISABLE_FAST_INSTALL AM_PROG_LIBTOOL # Test whenever ld supports -version-script @@ -347,6 +365,9 @@ fi mcs_topdir='$(top_srcdir)/'$mcsdir mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir +## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. +AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno]) + AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) @@ -402,7 +423,7 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) -if test x$platform_win32 = xyes; then +if test x$cross_compiling$platform_win32 = xnoyes; then AC_MSG_CHECKING(for cygwin glib2-dev package) if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then AC_MSG_RESULT(found) @@ -453,18 +474,45 @@ if test "x$enable_static" = "xno"; then with_static_mono=no fi +if test "x$platform_win32" = "xyes"; then + # Boehm GC requires the runtime to be in its own dll + with_static_mono=no +fi + AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno) +AC_ARG_WITH(xen_opt, [ --with-xen_opt=yes,no Enable Xen-specific behaviour],[],[with_xen_opt=yes]) +if test "x$with_xen_opt" = "xyes"; then + AC_DEFINE(MONO_XEN_OPT, 1, [Xen-specific behaviour]) + ORIG_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mno-tls-direct-seg-refs" + AC_MSG_CHECKING(for -mno-tls-direct-seg-refs option to gcc) + AC_TRY_COMPILE([], [ + void main () { } + ], [ + AC_MSG_RESULT(yes) + ], [ + AC_MSG_RESULT(no) + CFLAGS=$ORIG_CFLAGS + ]) +fi + +DISABLED_FEATURES=none + AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems. - LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, reflection_emit.], + LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, + reflection_emit, large_code, logging, com, ssa, generics.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do eval "mono_feature_disable_$feature='yes'" AC_MSG_NOTICE([Disabled support for feature: $feature]) done + DISABLED_FEATURES=$enable_minimal disabled="Disabled: $enable_minimal" ],[]) +AC_DEFINE_UNQUOTED(DISABLED_FEATURES, "$DISABLED_FEATURES", [String of disabled features]) + if test "x$mono_feature_disable_aot" = "xyes"; then AC_DEFINE(DISABLE_AOT, 1, [Disable AOT support]) fi @@ -489,6 +537,38 @@ if test "x$mono_feature_disable_reflection_emit" = "xyes"; then AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support]) fi +if test "x$mono_feature_disable_large_code" = "xyes"; then + AC_DEFINE(DISABLE_LARGE_CODE, 1, [Disable support for huge assemblies]) +fi + +if test "x$mono_feature_disable_logging" = "xyes"; then + AC_DEFINE(DISABLE_LOGGING, 1, [Disable support debug logging]) +fi + +if test "x$mono_feature_disable_com" = "xyes"; then + AC_DEFINE(DISABLE_COM, 1, [Disable COM support]) +fi + +if test "x$mono_feature_disable_ssa" = "xyes"; then + AC_DEFINE(DISABLE_SSA, 1, [Disable advanced SSA JIT optimizations]) +fi + +if test "x$mono_feature_disable_generics" = "xyes"; then + AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support]) +fi + +AC_MSG_CHECKING(for visibility __attribute__) +AC_TRY_COMPILE([], [ + void __attribute__ ((visibility ("hidden"))) doit (void) {} + void main () { doit (); } +], [ + have_visibility_hidden=yes + AC_MSG_RESULT(yes) +], [ + have_visibility_hidden=no + AC_MSG_RESULT(no) +]) + LIBGC_CFLAGS= LIBGC_LIBS= LIBGC_STATIC_LIBS= @@ -514,6 +594,9 @@ case "x$gc" in AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl) if test "x$found_gcj_malloc" = "xyes"; then AC_DEFINE(HAVE_GC_GCJ_MALLOC) + AC_DEFINE_UNQUOTED(USED_GC_NAME, "System Boehm (with typed GC)", [GC description]) + else + AC_DEFINE_UNQUOTED(USED_GC_NAME, "System Boehm (no typed GC)", [GC description]) fi AC_CHECK_LIB(gc, GC_enable, found_gc_enable="yes",,$libdl) if test "x$found_gc_enable" = "xyes"; then @@ -524,6 +607,11 @@ 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 @@ -542,10 +630,23 @@ case "x$gc" in # The included libgc contains GCJ support AC_DEFINE(HAVE_GC_GCJ_MALLOC) AC_DEFINE(HAVE_GC_ENABLE) + AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC)", [GC description]) + ;; + + xsgen) + found_boehm=no + gc_headers=no + use_included_gc=no + AC_DEFINE(HAVE_SGEN_GC,1,[Using the simple generational GC.]) + AC_DEFINE(HAVE_MOVING_COLLECTOR,1,[The GC can move objects.]) + AC_DEFINE(HAVE_WRITE_BARRIERS,1,[The GC needs write barriers.]) + AC_DEFINE_UNQUOTED(USED_GC_NAME, "Simple generational", [GC description]) ;; xnone) AC_MSG_WARN("Compiling mono without GC.") + AC_DEFINE_UNQUOTED(USED_GC_NAME, "none", [GC description]) + AC_DEFINE(HAVE_NULL_GC,1,[No GC support.]) ;; *) AC_MSG_ERROR([Invalid argument to --with-gc.]) @@ -559,7 +660,7 @@ if test "x$large_heap" = "xyes"; then fi # tell libgc/configure about what we want -ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads" +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) @@ -586,6 +687,8 @@ if test x$platform_win32 = xno; then AC_SUBST(ikvm_native_dir) + AC_CHECK_HEADERS(execinfo.h) + AC_CHECK_FUNCS(getgrgid_r) AC_CHECK_FUNCS(getgrnam_r) AC_CHECK_FUNCS(getpwnam_r) @@ -721,6 +824,20 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT(no) ]) + dnl ***************************** + dnl *** Checks for IPV6_PKTINFO *** + dnl ***************************** + AC_MSG_CHECKING(for IPV6_PKTINFO) + AC_TRY_COMPILE([#include ], [ + int level = IPV6_PKTINFO; + ], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_IPV6_PKTINFO) + ], [ + AC_MSG_RESULT(no) + ]) + dnl ********************************* dnl *** Check for struct ip_mreqn *** dnl ********************************* @@ -868,6 +985,8 @@ if test x$platform_win32 = xno; then AC_DEFINE(USE_MONO_MUTEX) ]) AC_CHECK_FUNCS(pthread_attr_setstacksize) + AC_CHECK_FUNCS(pthread_attr_getstack) + AC_CHECK_FUNCS(pthread_get_stacksize_np pthread_get_stackaddr_np) dnl *********************************** dnl *** Checks for working __thread *** @@ -1152,18 +1271,29 @@ if test x$platform_win32 = xno; then dnl ********************************** dnl *** Checks for MonoPosixHelper *** dnl ********************************** + AC_CHECK_FUNC(setkey, , + AC_CHECK_LIB(crypt, setkey, [ + AC_DEFINE(HAVE_SETKEY, 1, [Define if setkey(3) is available]) + CRYPT_LIBS="-lcrypt" + ]) + ) + AC_SUBST(CRYPT_LIBS) AC_CHECK_HEADERS(checklist.h) AC_CHECK_HEADERS(fstab.h) + AC_CHECK_HEADERS(attr/xattr.h) + AC_CHECK_HEADERS(sys/extattr.h) AC_CHECK_HEADERS(sys/sendfile.h) AC_CHECK_HEADERS(sys/statvfs.h) AC_CHECK_HEADERS(sys/vfstab.h) AC_CHECK_HEADERS(sys/xattr.h) + AC_CHECK_HEADERS(sys/mman.h) AC_CHECK_FUNCS(getdomainname) AC_CHECK_FUNCS(setdomainname) AC_CHECK_FUNCS(fgetgrent) AC_CHECK_FUNCS(fgetpwent) AC_CHECK_FUNCS(fgetpwent) AC_CHECK_FUNCS(getfsstat) + AC_CHECK_FUNCS(lutimes) AC_CHECK_FUNCS(mremap) AC_CHECK_FUNCS(remap_file_pages) AC_CHECK_FUNCS(posix_fadvise) @@ -1185,6 +1315,12 @@ if test x$platform_win32 = xno; then [#include #include ]) + dnl Favour xattr through glibc, but use libattr if we have to + AC_CHECK_FUNC(lsetxattr, , + AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",) + ) + AC_SUBST(XATTR_LIB) + dnl ********************************* dnl *** Check for Console 2.0 I/O *** dnl ********************************* @@ -1195,11 +1331,16 @@ if test x$platform_win32 = xno; then #endif ]) AC_CHECK_HEADERS([termios.h]) + + dnl * This is provided in io-layer, but on windows it's only available + dnl * on xp+ + AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available]) else jdk_headers_found=no 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(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?)) dnl ********************************* dnl *** Check for struct ip_mreqn *** @@ -1228,6 +1369,7 @@ else AC_MSG_RESULT(no) ]) ]) + AC_CHECK_FUNCS(GetProcessId) fi dnl socklen_t check @@ -1372,6 +1514,23 @@ case "$host" in arch_target=x86; JIT_SUPPORTED=yes jit_wanted=true + case $host_os in + solaris*) + LIBC="libc.so" + INTL="libintl.so" + + # 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"))); + # void foo () + # { + # void *p = &astruct; + # } + # gcc -fPIC --shared -o libfoo.so foo.c + # yields: + # foo.c:6: warning: visibility attribute not supported in this configuration; ignored + # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally + have_visibility_hidden=no + esac ;; x86_64-*-* | amd64-*-*) TARGET=AMD64; @@ -1379,6 +1538,17 @@ case "$host" in JIT_SUPPORTED=yes jit_wanted=true ;; + ia64-*-*) + TARGET=IA64 + arch_target=ia64 + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + jit_wanted=true + LIBC="libc.so.6.1" + INTL="libc.so.6.1" + AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)]) + libmono_ldflags="-lunwind" + ;; sparc*-*-*) if test "x$ac_cv_sizeof_void_p" = "x8"; then TARGET=SPARC64 @@ -1396,7 +1566,11 @@ case "$host" in esac jit_wanted=true if test x"$GCC" = xyes; then - CFLAGS="$CFLAGS -Wno-cast-align" + # We don't support v8 cpus + CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9" + fi + if test x"$AR" = xfalse; then + AC_MSG_ERROR([The required utility 'ar' is not found in your PATH. Usually it can be found in /usr/ccs/bin.]) fi ;; alpha*-*-linux* | alpha*-*-osf*) @@ -1415,19 +1589,6 @@ case "$host" in *-*-mingw*|*-*-cygwin*) INTL="intl" ;; -# ia64-*-linux* | ia64-*-hpux*) -# TARGET=IA64; -# arch_target=ia64; -# JIT_SUPPORTED=no; -# ACCESS_UNALIGNED="no"; -# case "$host_os" in -# linux*) LIBC="libc.so.6.1";; -# hpux*) LIBC="libc.so.1";; -# esac -# ;; -# m68k-*-linux*) -# TARGET=M68K -# ;; hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00) TARGET=HPPA; arch_target=hppa; @@ -1451,12 +1612,12 @@ case "$host" in JIT_SUPPORTED=yes jit_wanted=true ;; - arm-*-linux-* | armv4l-*-linux-*) + arm*-linux*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no" - INTERP_SUPPORTED=yes - interp_wanted=true + JIT_SUPPORTED=yes + jit_wanted=true ;; s390-*-linux*) TARGET=S390; @@ -1464,6 +1625,7 @@ case "$host" in arch_target=s390; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes + jit_wanted=true ;; s390x-*-linux*) TARGET=S390x; @@ -1471,9 +1633,14 @@ case "$host" in arch_target=s390x; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes + jit_wanted=true ;; esac +if test "x$have_visibility_hidden" = "xyes"; then + AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute]) +fi + AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts that default to the JIT],[ if test x$withval = xyes; then jit_wanted=true @@ -1503,7 +1670,7 @@ if test x$JIT_SUPPORTED = xyes; then fi fi else - if $interp_wanted; then + if test x$interp_wanted = xtrue; then jit_status="interpreter" else AC_ERROR(No JIT or interpreter support available or selected.) @@ -1515,7 +1682,7 @@ AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue) libsuffix=".so" case "$host" in - powerpc-*-darwin*) + *-*-darwin*) libsuffix=".dylib" LIBC="libc.dylib" INTL="libintl.dylib" @@ -1535,9 +1702,7 @@ case "$host" in LIBC="libc.so" INTL="libintl.so" ;; -esac - -if test "x$X11" = "xlibX11.so"; then + *-*-*linux*) AC_PATH_X AC_MSG_CHECKING(for the soname of libX11.so) for i in $x_libraries /usr/lib /usr/lib64; do @@ -1552,7 +1717,9 @@ if test "x$X11" = "xlibX11.so"; then if test "x$X11" = "xlibX11.so"; then AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]); fi -fi + ;; +esac + AC_SUBST(libsuffix) @@ -1570,8 +1737,8 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then # rm -f conftest.c conftest.so conftest echo "static __thread int foo; void main () { foo = 5; }" > conftest.c - gcc -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1 - gcc -o conftest conftest.so > /dev/null 2>&1 + $CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1 + $CC -o conftest conftest.so > /dev/null 2>&1 if test ! -f conftest; then AC_MSG_WARN([Disabling usage of __thread.]); with_tls=pthread @@ -1580,11 +1747,28 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then fi fi +mono_debugger_supported=no +if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then + if test x$use_included_gc = xyes; then + case "$host" in + *-*-*linux*) + mono_debugger_supported=yes + ;; + esac + fi +fi + +AC_MSG_CHECKING(if the Mono Debugger is supported on this platform) +if test "x$mono_debugger_supported" = "xyes"; then + AC_DEFINE(MONO_DEBUGGER_SUPPORTED,1,[The Mono Debugger is supported on this platform]) +fi +AC_MSG_RESULT($mono_debugger_supported) +AM_CONDITIONAL(MONO_DEBUGGER_SUPPORTED, test x$mono_debugger_supported = xyes) + if test "x$with_tls" = "x__thread"; then AC_DEFINE(HAVE_KW_THREAD) - # Pass the information to libgc + # Pass the information to libgc CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS" - export CPPFLAGS AC_MSG_CHECKING(if the tls_model attribute is supported) AC_TRY_COMPILE([static __thread int foo __attribute__((tls_model("initial-exec")));], [ ], [ @@ -1682,11 +1866,12 @@ 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=../../../.. case $srcdir in - [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;; + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; .) reldir=$depth ;; *) reldir=$depth/$srcdir ;; esac @@ -1700,7 +1885,7 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config], AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config], [ depth=../../../.. case $srcdir in - [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;; + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; .) reldir=$depth ;; *) reldir=$depth/$srcdir ;; esac @@ -1711,10 +1896,26 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config], cd $depth ],[LN_S='$LN_S']) +AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config], +[ depth=../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/2.0 + cd runtime/etc/mono/2.0 + rm -f web.config + $LN_S $reldir/data/net_2_0/web.config web.config + 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 @@ -1726,8 +1927,6 @@ mono/dis/Makefile mono/cil/Makefile mono/arch/Makefile mono/os/Makefile -mono/os/win32/Makefile -mono/os/unix/Makefile mono/arch/x86/Makefile mono/arch/amd64/Makefile mono/arch/hppa/Makefile @@ -1741,12 +1940,17 @@ mono/arch/ia64/Makefile mono/interpreter/Makefile mono/tests/Makefile mono/tests/tests-config +mono/tests/cas/Makefile +mono/tests/cas/assembly/Makefile +mono/tests/cas/demand/Makefile +mono/tests/cas/inheritance/Makefile +mono/tests/cas/linkdemand/Makefile +mono/tests/cas/threads/Makefile mono/benchmark/Makefile mono/monoburg/Makefile mono/monograph/Makefile mono/io-layer/Makefile mono/mini/Makefile -mono/handles/Makefile mono/profiler/Makefile ikvm-native/Makefile scripts/Makefile @@ -1764,6 +1968,15 @@ tools/locale-builder/Makefile runtime/Makefile ]) +if test x$platform_win32 = xyes; then + # Get rid of 'cyg' prefixes in library names + sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool + # libtool seems to inherit -mno-cygwin from our CFLAGS, and uses it to compile its executable + # wrapper scripts which use exec(). gcc has no problem compiling+linking this, but the resulting + # executable doesn't work... + sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool +fi + ( case $prefix in NONE) prefix=$ac_default_prefix ;; @@ -1774,29 +1987,35 @@ runtime/Makefile test -w $srcdir/$mcsdir/build || chmod +w $srcdir/$mcsdir/build - echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make - echo "exec_prefix=$exec_prefix" >> $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 - echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make - - export VERSION - [myver=$($AWK 'BEGIN { - split (ENVIRON["VERSION"] ".0.0.0.0", vsplit, ".") - print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] - }')] - - cat > $srcdir/$mcsdir/build/common/MonoVersion.cs < $srcdir/$mcsdir/build/config.make + echo "exec_prefix=$exec_prefix" >> $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 ;; + esac + + echo "INSTALL = $mcs_INSTALL" >> $srcdir/$mcsdir/build/config.make + + export VERSION + [myver=$($AWK 'BEGIN { + split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".") + print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] + }')] + + echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make + fi ) libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} @@ -1804,7 +2023,6 @@ libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} echo " mcs source: $mcs_topdir GC: $gc - Globalization: $enable_glob TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status @@ -1814,3 +2032,11 @@ echo " $disabled " +if test x$gc = xsgen; then + echo IMPORTANT: + echo IMPORTANT: You have selected an experimental, work-in-progress + echo IMPORTANT: GC engine. This GC engine is currently not supported + echo IMPORTANT: and is not yet ready for use. + echo IMPORTANT: + echo IMPORTANT: There are known problems with it, use at your own risk. +fi