X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=677286bba5695f49b5631b2c26fd66678fb94d64;hb=7246c849afde55333072256f04cd18ecea801889;hp=af9ba86de37c50b95fbc7f66b3f5a746b10f17ef;hpb=29369062ec049a27925c0ce988e1119c6380f990;p=mono.git diff --git a/configure.in b/configure.in index af9ba86de37..677286bba56 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.9) +AM_INIT_AUTOMAKE(mono,2.2) AM_MAINTAINER_MODE API_VER=1.0 @@ -36,6 +36,11 @@ else gc_default=boehm fi +# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure +# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0 +CPPFLAGS_FOR_LIBGC=$CPPFLAGS +CFLAGS_FOR_LIBGC=$CFLAGS + # # These are the flags that need to be stored in the mono.pc file for # compiling code that will embed Mono @@ -44,8 +49,6 @@ libmono_cflags="" libmono_ldflags="" AC_SUBST(libmono_cflags) AC_SUBST(libmono_ldflags) -export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -AC_SUBST(export_ldflags) # Variable to have relocatable .pc files (lib, or lib64) reloc_libdir=`basename ${libdir}` @@ -60,6 +63,7 @@ need_link_unlink=no # Thread configuration inspired by sleepycat's db AC_MSG_CHECKING([host platform characteristics]) libgc_threads=no +has_dtrace=no case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes @@ -72,8 +76,8 @@ case "$host" in HOST_CC="gcc" # 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" + libmono_cflags="-mno-cygwin -mms-bitfields -mwindows" + libmono_ldflags="-mno-cygwin -mms-bitfields -mwindows" libdl= libgc_threads=win32 gc_default=included @@ -94,60 +98,7 @@ case "$host" in libgc_threads=pthreads with_sigaltstack=no ;; -# these flags will work for all versions of -STABLE -# - *-*-*freebsd4*) - platform_win32=no - if test "x$PTHREAD_CFLAGS" = "x"; then - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS" - libmono_cflags="-D_THREAD_SAFE" - else - CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS" - libmono_cflags="$PTHREAD_CFLAGS" - fi - if test "x$PTHREAD_LIBS" = "x"; then - LDFLAGS="$LDFLAGS -pthread" - libmono_ldflags="-pthread" - else - 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= - libgc_threads=pthreads -# TLS isn't implemented at all on 4-STABLE - with_tls=pthread - ;; - *-*-*freebsd5*) - platform_win32=no - if test "x$PTHREAD_CFLAGS" = "x"; then - CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" - libmono_cflags= - else - CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS" - libmono_cflags="$PTHREAD_CFLAGS" - fi - if test "x$PTHREAD_LIBS" = "x"; then - LDFLAGS="$LDFLAGS -pthread" - libmono_ldflags="-pthread" - else - 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= - with_sigaltstack=yes - libgc_threads=pthreads -# TLS is only partially implemented on 5-STABLE (compiler support -# but NOT library support) -# - with_tls=pthread - ;; - *-*-*freebsd6*) + *-*-*freebsd*) platform_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" @@ -163,9 +114,9 @@ case "$host" in LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi - CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6" + CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" need_link_unlink=yes - AC_DEFINE(PTHREAD_POINTER_ID) + AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer]) libdl= libgc_threads=pthreads with_sigaltstack=yes @@ -219,6 +170,7 @@ case "$host" in libgc_threads=pthreads # This doesn't seem to work on solaris/x86, but the configure test runs with_tls=pthread + has_dtrace=yes ;; *-*-darwin*) platform_win32=no @@ -229,10 +181,11 @@ case "$host" in libmono_ldflags="-pthread" need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) - AC_DEFINE(USE_MACH_SEMA) + AC_DEFINE(USE_MACH_SEMA, 1, [...]) no_version_script=yes libdl= libgc_threads=pthreads + has_dtrace=yes if test "x$cross_compiling" = "xyes"; then has_broken_apple_cpp=yes fi @@ -250,7 +203,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) +AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux) AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC @@ -288,6 +241,7 @@ AC_SUBST(HOST_CC) AC_SUBST(BUILD_EXEEXT) AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes]) +AM_CONDITIONAL(USE_BATCH_FILES, [test x$platform_win32 = xyes -a x$cross_compiling = xyes]) # Set STDC_HEADERS AC_HEADER_STDC @@ -295,6 +249,11 @@ AC_LIBTOOL_WIN32_DLL # This causes monodis to not link correctly #AC_DISABLE_FAST_INSTALL AM_PROG_LIBTOOL +# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building. +DOLT + +export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` +AC_SUBST(export_ldflags) # Test whenever ld supports -version-script AC_PROG_LD @@ -305,7 +264,8 @@ 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 sys/mkdev.h) +AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h) +AC_CHECK_HEADERS(sys/user.h) AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no]) if test x$have_zlib = xyes; then @@ -341,17 +301,7 @@ AC_CHECK_HEADERS(syslog.h) # for mono/dis AC_CHECK_HEADERS(wchar.h) -case "$host" in - *-*-*freebsd6*) - AC_CHECK_HEADERS(ieeefp.h) - ;; - *-*-*freebsd*) - /* Only freebsd6 has a working ieeefp.h */ - ;; - *) - AC_CHECK_HEADERS(ieeefp.h) - ;; -esac +AC_CHECK_HEADERS(ieeefp.h) AC_MSG_CHECKING(for isinf) AC_TRY_LINK([#include ], [ int f = isinf (1); @@ -394,6 +344,7 @@ else esac fi CFLAGS="$CFLAGS -g $WARN" +CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g" # Where's the 'mcs' source tree? if test -d $srcdir/mcs; then @@ -402,6 +353,19 @@ else mcsdir=../mcs fi +# +# A sanity check to catch cases where the package was unpacked +# with an ancient tar program (Solaris) +# +AC_MSG_CHECKING(integrity of package) +if test -f $srcdir/$mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs +then + AC_MSG_RESULT(ok) +else + errorm="Your mono distribution is incomplete; if unpacking from a tar file, make sure you use GNU tar; see http://www.mono-project.com/IncompletePackage for more details" + AC_MSG_ERROR([$errorm]) +fi + mcs_topdir='$(top_srcdir)/'$mcsdir mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir @@ -422,6 +386,10 @@ if test -d $srcdir/$olivedir; then olive_topdir='$(top_srcdir)/'$olivedir fi +# gettext: prepare the translation directories. +# we do not configure the full gettext, as we consume it dynamically from C# +AM_PO_SUBDIRS + AC_ARG_WITH([libgdiplus], [ --with-libgdiplus=installed|sibling| Override the libgdiplus used for System.Drawing tests (defaults to NO)], [], [with_libgdiplus=installed]) @@ -470,9 +438,17 @@ embedded) AC_CONFIG_SUBDIRS(eglib) ;; system) + if test "x$cross_compiling" = "xyes"; then + pkg_config_path="$PKG_CONFIG_PATH" + unset PKG_CONFIG_PATH + fi BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` - + if test "x$cross_compiling" = "xyes"; then + PKG_CONFIG_PATH=$pkg_config_path + export PKG_CONFIG_PATH + fi + ## Versions of dependencies GLIB_REQUIRED_VERSION=1.3.11 @@ -551,17 +527,21 @@ if test "x$with_xen_opt" = "xyes"; then void main () { } ], [ AC_MSG_RESULT(yes) + # Pass it to libgc as well + CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs" ], [ AC_MSG_RESULT(no) CFLAGS=$ORIG_CFLAGS ]) fi +AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet runtime build], enable_quiet_build=$enableval, enable_quiet_build=yes) + 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, large_code, logging, com, ssa, generics.], + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do eval "mono_feature_disable_$feature='yes'" @@ -580,6 +560,7 @@ fi if test "x$mono_feature_disable_profiler" = "xyes"; then AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support]) fi +AM_CONDITIONAL(DISABLE_PROFILER, test x$mono_feature_disable_profiler = xyes) if test "x$mono_feature_disable_decimal" = "xyes"; then AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support]) @@ -595,6 +576,11 @@ fi if test "x$mono_feature_disable_reflection_emit" = "xyes"; then AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support]) + mono_feature_disable_reflection_emit_save=yes +fi + +if test "x$mono_feature_disable_reflection_emit_save" = "xyes"; then + AC_DEFINE(DISABLE_REFLECTION_EMIT_SAVE, 1, [Disable assembly saving support in reflection emit]) fi if test "x$mono_feature_disable_large_code" = "xyes"; then @@ -617,6 +603,20 @@ if test "x$mono_feature_disable_generics" = "xyes"; then AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support]) fi +if test "x$mono_feature_disable_attach" = "xyes"; then + AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support]) +fi + +if test "x$mono_feature_disable_jit" = "xyes"; then + AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.]) +fi + +AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes) + +if test "x$mono_feature_disable_simd" = "xyes"; then + AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.]) +fi + AC_MSG_CHECKING(for visibility __attribute__) AC_TRY_COMPILE([], [ void __attribute__ ((visibility ("hidden"))) doit (void) {} @@ -629,6 +629,11 @@ AC_TRY_COMPILE([], [ AC_MSG_RESULT(no) ]) +AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking]) +if test x$enable_parallel_mark = xyes; then + libgc_configure_args="$libgc_configure_args --enable-parallel-mark" +fi + LIBGC_CFLAGS= LIBGC_LIBS= LIBGC_STATIC_LIBS= @@ -645,7 +650,7 @@ case "x$gc" in AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.") fi - AC_DEFINE(HAVE_BOEHM_GC) + AC_DEFINE(HAVE_BOEHM_GC, 1, [Have Boehm GC]) AC_SUBST(HAVE_BOEHM_GC) LIBGC_LIBS="-lgc $libdl" LIBGC_STATIC_LIBS="$LIBGC_LIBS" @@ -653,14 +658,14 @@ case "x$gc" in # AC_CHECK_FUNCS does not work for some reason... 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(HAVE_GC_GCJ_MALLOC, 1, [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 - AC_DEFINE(HAVE_GC_ENABLE) + AC_DEFINE(HAVE_GC_ENABLE, 1, [Have 'GC_enable']) fi ;; @@ -674,16 +679,20 @@ case "x$gc" in LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la' LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la' - AC_DEFINE(HAVE_BOEHM_GC) + AC_DEFINE(HAVE_BOEHM_GC, 1, [Have Boehm GC]) AC_SUBST(HAVE_BOEHM_GC) - AC_DEFINE(HAVE_GC_H) - AC_DEFINE(USE_INCLUDED_LIBGC) + AC_DEFINE(HAVE_GC_H, 1, [Have gc.h]) + AC_DEFINE(USE_INCLUDED_LIBGC, 1, [Use included libgc]) # 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]) + AC_DEFINE(HAVE_GC_GCJ_MALLOC, 1, [Have GC_gcj_malloc]) + AC_DEFINE(HAVE_GC_ENABLE, 1, [Have GC_enable]) + if test x$enable_parallel_mark = xyes; then + AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description]) + else + AC_DEFINE_UNQUOTED(USED_GC_NAME, "Included Boehm (with typed GC)", [GC description]) + fi ;; xsgen) @@ -822,7 +831,7 @@ if test x$platform_win32 = xno; then } ], [ AC_MSG_RESULT(ok) - AC_DEFINE(HAVE_LARGE_FILE_SUPPORT) + AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support]) large_CPPFLAGS="$large_CPPFLAGS $1" large_offt=yes ], [ @@ -855,7 +864,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MSG_NOSIGNAL) + AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, [Have MSG_NOSIGNAL]) ], [ # We'll have to use signals AC_MSG_RESULT(no) @@ -870,7 +879,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOL_IP) + AC_DEFINE(HAVE_SOL_IP, 1, [Have SOL_IP]) ], [ # We'll have to use getprotobyname AC_MSG_RESULT(no) @@ -885,7 +894,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOL_IPV6) + AC_DEFINE(HAVE_SOL_IPV6, 1, [Have SOL_IPV6]) ], [ # We'll have to use getprotobyname AC_MSG_RESULT(no) @@ -900,7 +909,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOL_TCP) + AC_DEFINE(HAVE_SOL_TCP, 1, [Have SOL_TCP]) ], [ # We'll have to use getprotobyname AC_MSG_RESULT(no) @@ -915,7 +924,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_IP_PKTINFO) + AC_DEFINE(HAVE_IP_PKTINFO, 1, [Have IP_PKTINFO]) ], [ AC_MSG_RESULT(no) ]) @@ -929,7 +938,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_IPV6_PKTINFO) + AC_DEFINE(HAVE_IPV6_PKTINFO, 1, [Have IPV6_PKTINFO]) ], [ AC_MSG_RESULT(no) ]) @@ -943,7 +952,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_IP_DONTFRAGMENT) + AC_DEFINE(HAVE_IP_DONTFRAGMENT, 1, [Have IP_DONTFRAGMENT]) ], [ AC_MSG_RESULT(no) ]) @@ -957,7 +966,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_IP_MTU_DISCOVER) + AC_DEFINE(HAVE_IP_MTU_DISCOVER, 1, [Have IP_MTU_DISCOVER]) ], [ AC_MSG_RESULT(no) ]) @@ -972,7 +981,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRUCT_IP_MREQN) + AC_DEFINE(HAVE_STRUCT_IP_MREQN, 1, [Have struct ip_mreqn]) ], [ # We'll just have to try and use struct ip_mreq AC_MSG_RESULT(no) @@ -983,7 +992,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRUCT_IP_MREQ) + AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1, [Have struct ip_mreq]) ], [ # No multicast support AC_MSG_RESULT(no) @@ -999,7 +1008,7 @@ if test x$platform_win32 = xno; then ], [ # Yes, we have it... AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GETHOSTBYNAME2_R) + AC_DEFINE(HAVE_GETHOSTBYNAME2_R, 1, [Have gethostbyname2_r]) ], [ AC_MSG_RESULT(no) ]) @@ -1016,7 +1025,7 @@ if test x$platform_win32 = xno; then dnl *********************************************** # AC_CHECK_SIZEOF can't cope with struct members :-( AC_MSG_CHECKING(size of sockaddr_un.sun_path) - AC_CACHE_VAL(cv_mono_sizeof_sunpath, + AC_CACHE_VAL(mono_cv_sizeof_sunpath, [AC_TRY_RUN([ #include #include @@ -1029,11 +1038,11 @@ if test x$platform_win32 = xno; then fprintf(f, "%d\n", sizeof(sock_un.sun_path)); exit(0); } - ], cv_mono_sizeof_sunpath=`cat conftestval`, - cv_mono_sizeof_sunpath=0, - cv_mono_sizeof_sunpath=0)])dnl - AC_MSG_RESULT($cv_mono_sizeof_sunpath) - AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath) + ], mono_cv_sizeof_sunpath=`cat conftestval`, + mono_cv_sizeof_sunpath=0, + mono_cv_sizeof_sunpath=0)])dnl + AC_MSG_RESULT($mono_cv_sizeof_sunpath) + AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path]) dnl ************************************* dnl *** Checks for zero length arrays *** @@ -1046,10 +1055,10 @@ if test x$platform_win32 = xno; then }; ], [], [ AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0) + AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0, [Length of zero length arrays]) ], [ AC_MSG_RESULT(no) - AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1) + AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1, [Length of zero length arrays]) ]) dnl ***************************** @@ -1081,13 +1090,7 @@ if test x$platform_win32 = xno; then # and libpthread does not exist # case "${host}" in - *-*-*freebsd4*) - AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread") - ;; - *-*-*freebsd5*) - AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread") - ;; - *-*-*freebsd6*) + *-*-*freebsd*) AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread") ;; *) @@ -1106,7 +1109,7 @@ if test x$platform_win32 = xno; then ], [ AC_MSG_RESULT(no) AC_MSG_WARN(Using mono_mutex_t for recursive mutexes) - AC_DEFINE(USE_MONO_MUTEX) + AC_DEFINE(USE_MONO_MUTEX, 1, [Use mono_mutex_t]) ]) AC_CHECK_FUNCS(pthread_attr_setstacksize) AC_CHECK_FUNCS(pthread_attr_getstack) @@ -1250,7 +1253,7 @@ if test x$platform_win32 = xno; then ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + AC_DEFINE(HAVE_WORKING_SIGALTSTACK, 1, [Have a working sigaltstack]) ], [ with_sigaltstack=no AC_MSG_RESULT(no) @@ -1265,6 +1268,9 @@ if test x$platform_win32 = xno; then # pthread (first!) on Linux AC_SEARCH_LIBS(sem_init, pthread rt posix4) + AC_SEARCH_LIBS(shm_open, pthread rt posix4) + AC_CHECK_FUNCS(shm_open) + dnl ******************************** dnl *** Checks for timezone stuff ** dnl ******************************** @@ -1276,7 +1282,7 @@ if test x$platform_win32 = xno; then tm.tm_gmtoff = 1; ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)) if test $ac_cv_struct_tm_gmtoff = yes; then - AC_DEFINE(HAVE_TM_GMTOFF) + AC_DEFINE(HAVE_TM_GMTOFF, 1, [Have tm_gmtoff]) else AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone, AC_TRY_COMPILE([ @@ -1285,7 +1291,7 @@ if test x$platform_win32 = xno; then timezone = 1; ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no)) if test $ac_cv_var_timezone = yes; then - AC_DEFINE(HAVE_TIMEZONE) + AC_DEFINE(HAVE_TIMEZONE, 1, [Have timezone variable]) else AC_ERROR(unable to find a way to determine timezone) fi @@ -1299,13 +1305,13 @@ if test x$platform_win32 = xno; 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_DEFINE(HAVE_FINITE, 1, [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); ], - AC_DEFINE(HAVE_ISFINITE) AC_MSG_RESULT(yes), + AC_DEFINE(HAVE_ISFINITE, 1, [Have isfinite]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))) dnl **************************************************************** @@ -1322,7 +1328,7 @@ if test x$platform_win32 = xno; then int s = signbit(1.0); ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SIGNBIT) + AC_DEFINE(HAVE_SIGNBIT, 1, [Have signbit]) ], [ AC_MSG_RESULT(no) ]) @@ -1434,12 +1440,17 @@ if test x$platform_win32 = xno; then #include ]) AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], , [#include ]) + AC_CHECK_TYPES([struct flock], [AC_DEFINE(HAVE_STRUCT_FLOCK)], , + [#include + #include ]) AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], , [#include ]) AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], , [#include #include #include ]) + AC_CHECK_TYPES([struct timespec], [AC_DEFINE(HAVE_STRUCT_TIMESPEC)], , + [#include ]) AC_CHECK_TYPES([struct timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], , [#include #include @@ -1460,11 +1471,20 @@ if test x$platform_win32 = xno; then ) AC_SUBST(XATTR_LIB) + dnl kinfo_proc.kp_proc works on darwin but fails on other simil-bsds + AC_CHECK_MEMBERS( + [struct kinfo_proc.kp_proc],,, + [#include + #include + #include + ]) + dnl ********************************* dnl *** Checks for Windows compilation *** dnl ********************************* AC_CHECK_HEADERS(sys/time.h) AC_CHECK_HEADERS(sys/param.h) + AC_CHECK_HEADERS(dirent.h) dnl ********************************* dnl *** Check for Console 2.0 I/O *** @@ -1529,7 +1549,7 @@ AC_TRY_COMPILE([ socklen_t foo; ],[ ac_cv_c_socklen_t=yes - AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_SOCKLEN_T, 1, [Have socklen_t]) AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) @@ -1559,7 +1579,7 @@ AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h) AC_MSG_RESULT(no))) if test "x$ac_cv_truncl" != "xyes"; then - AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL) LIBS="$LIBS -lsunmath"]) + AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"]) fi dnl **************************** @@ -1590,7 +1610,7 @@ dnl Everywhere else, it's /dev/random ;; esac -AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM") +AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM", [Name of /dev/random]) dnl Now check if the device actually exists @@ -1599,7 +1619,7 @@ if test "x$try_dev_random" = "xyes"; then [if test -r "$NAME_DEV_RANDOM" ; then ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi]) if test "x$ac_cv_have_dev_random" = "xyes"; then - AC_DEFINE(HAVE_CRYPT_RNG) + AC_DEFINE(HAVE_CRYPT_RNG, 1, [Have /dev/random]) fi else AC_MSG_CHECKING(for random device) @@ -1632,14 +1652,87 @@ AC_MSG_CHECKING([if inter-process shared handles are requested]) AC_ARG_ENABLE(shared-handles, [ --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes) AC_MSG_RESULT($try_shared_handles) if test "x$try_shared_handles" != "xyes"; then - AC_DEFINE(DISABLE_SHARED_HANDLES) + AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles]) AC_SUBST(DISABLE_SHARED_HANDLES) fi +if test x$gc = xsgen; then + if test x$with_tls != x__thread; then + AC_MSG_ERROR([The SGEN garbage collector depends on a working __thread implementation, and either --with-thread=pthread was passed to configure, or the configure test for __thread failed.]) + fi +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]) +AC_MSG_CHECKING([if big-arrays are to be enabled]) +AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no) +if test "x$enable_big_arrays" = "xyes" ; then + if test "x$ac_cv_sizeof_void_p" = "x8"; then + AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue]) + else + AC_MSG_ERROR([The allocation and indexing of arrays greater than Int32.MaxValue is not supported on this platform.]) + fi +fi +AC_MSG_RESULT($enable_big_arrays) + +dnl ************** +dnl *** DTRACE *** +dnl ************** + +AC_ARG_ENABLE(dtrace,[ --enable-dtrace Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=$has_dtrace) + +if test "x$enable_dtrace" = "xyes"; then + if test "x$has_dtrace" = "xno"; then + AC_MSG_ERROR([DTrace probes are not supported on this platform.]) + fi + AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin]) + if test "x$DTRACE" = "xno"; then + AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.]) + enable_dtrace=no + fi +fi + +dtrace_g=no +if test "x$enable_dtrace" = "xyes"; then + AC_DEFINE(ENABLE_DTRACE, 1, [Enable DTrace probes]) + DTRACEFLAGS= + if test "x$ac_cv_sizeof_void_p" = "x8"; then + case "$host" in + powerpc-*-darwin*) + DTRACEFLAGS="-arch ppc64" + ;; + i*86-*-darwin*) + DTRACEFLAGS="-arch x86_64" + ;; + *) + DTRACEFLAGS=-64 + ;; + esac + else + case "$host" in + powerpc-*-darwin*) + DTRACEFLAGS="-arch ppc" + ;; + i*86-*-darwin*) + DTRACEFLAGS="-arch i386" + ;; + *) + DTRACEFLAGS=-32 + ;; + esac + fi + AC_SUBST(DTRACEFLAGS) + case "$host" in + *-*-solaris*) + dtrace_g=yes + ;; + esac + AC_CHECK_HEADERS([sys/sdt.h]) +fi +AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes]) +AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes]) + TARGET="unknown" ACCESS_UNALIGNED="yes" @@ -1770,7 +1863,11 @@ case "$host" in ;; macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* ) - TARGET=POWERPC; + if test "x$ac_cv_sizeof_void_p" = "x8"; then + TARGET=POWERPC64; + else + TARGET=POWERPC; + fi AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=ppc; JIT_SUPPORTED=yes @@ -1898,10 +1995,7 @@ esac AC_SUBST(libsuffix) -if test "x$TARGET" != "xAMD64"; then - # valgrind headers don't compile under x86-64 - AC_CHECK_HEADERS(valgrind/memcheck.h) -fi +AC_CHECK_HEADERS(valgrind/memcheck.h) if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then if test "x$with_tls" = "x__thread"; then @@ -1941,7 +2035,7 @@ 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) + AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword]) # Pass the information to libgc CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS" AC_MSG_CHECKING(if the tls_model attribute is supported) @@ -1984,7 +2078,14 @@ case "x$gc" in # 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\"" + # The problem with this approach, is that during a reconfigure, the main + # configure scripts gets invoked with these arguments, so we use separate + # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS. + LIBGC_CPPFLAGS=$CPPFLAGS + if test x$TARGET = xSPARC -o x$TARGET = xSPARC64; then + LIBGC_CPPFLAGS=`echo $LIBGC_CPPFLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//g'` + fi + ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$LIBGC_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\"" AC_CONFIG_SUBDIRS(libgc) ;; esac @@ -2013,6 +2114,14 @@ AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defa fi ]) +MALLOC_MEMPOOLS=no +AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no Use malloc for each single mempool allocation (only for runtime debugging, defaults to NO)],[ + if test x$with_malloc_mempools = xyes; then + MALLOC_MEMPOOLS=yes + AC_DEFINE(USE_MALLOC_FOR_MEMPOOLS,1,[Use malloc for each single mempool allocation]) + fi +]) + AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes) AC_SUBST(OPROFILE_CFLAGS) AC_SUBST(OPROFILE_LIBS) @@ -2033,6 +2142,7 @@ AM_CONDITIONAL(IA64, test x$TARGET = xIA64) AM_CONDITIONAL(M68K, test x$TARGET = xM68K) AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS) AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC) +AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64) AM_CONDITIONAL(ARM, test x$TARGET = xARM) AM_CONDITIONAL(S390, test x$TARGET = xS390) AM_CONDITIONAL(S390x, test x$TARGET = xS390x) @@ -2065,12 +2175,18 @@ AC_SUBST(mono_runtime) mono_cfg_root=$mono_build_root/runtime if test x$platform_win32 = xyes; then - mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc + if test "x$cross_compiling" = "xno"; then + mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc + else + mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\\'`\\etc + fi else mono_cfg_dir=$mono_cfg_root/etc fi AC_SUBST(mono_cfg_dir) +AC_CONFIG_FILES([po/mcs/Makefile.in]) + AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper]) AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper]) @@ -2144,10 +2260,14 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser], cd $depth ],[LN_S='$LN_S']) +if test x$enable_quiet_build = xyes; then + AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do $srcdir/scripts/patch-quiet.sh $i; done], [shell=$SHELL]) + AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) +fi + AC_OUTPUT([ Makefile mono-uninstalled.pc -scripts/mono-nunit.pc scripts/mono-find-provides scripts/mono-find-requires mono/Makefile @@ -2196,7 +2316,13 @@ data/net_2_0/Browsers/Makefile data/mint.pc data/mono.pc data/mono-cairo.pc +data/mono-nunit.pc +data/mono-options.pc +data/mono-lineeditor.pc +data/monodoc.pc data/dotnet.pc +data/dotnet35.pc +data/wcf.pc data/cecil.pc data/smcs.pc samples/Makefile @@ -2206,6 +2332,7 @@ tools/Makefile tools/locale-builder/Makefile runtime/Makefile msvc/Makefile +po/Makefile ]) if test x$platform_win32 = xyes; then @@ -2295,6 +2422,8 @@ echo " libgdiplus: $libgdiplus_msg zlib: $zlib_msg oprofile: $OPROFILE + BigArrays: $enable_big_arrays + DTrace: $enable_dtrace $disabled "