X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=5563b1b63b986aca2cc6e12c0a1e9f2c02fd5667;hb=39f1f228810acef5db6865eaa84281256754f491;hp=c779620590ce466fa0edc0ead666dd8d9d90a4db;hpb=2bcfca6f5f29f60983244a727d0554ebbc8729cd;p=mono.git diff --git a/configure.in b/configure.in index c779620590c..5563b1b63b9 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,2.1) +AM_INIT_AUTOMAKE(mono,2.3) AM_MAINTAINER_MODE API_VER=1.0 @@ -119,7 +119,8 @@ case "$host" in AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer]) libdl= libgc_threads=pthreads - with_sigaltstack=yes + # This doesn't seem to work as of 7.0 on amd64 + with_sigaltstack=no # TLS is only partially implemented on -CURRENT (compiler support # but NOT library support) # @@ -143,6 +144,7 @@ case "$host" in libmono_ldflags="-lpthread" libdl="-ldl" libgc_threads=pthreads + AOT_SUPPORTED="yes" ;; *-*-hpux*) platform_win32=no @@ -174,6 +176,7 @@ case "$host" in ;; *-*-darwin*) platform_win32=no + platform_darwin=yes CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent" libmono_cflags="-D_THREAD_SAFE" @@ -265,6 +268,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 sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h) +AC_CHECK_HEADERS(sys/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h) AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no]) if test x$have_zlib = xyes; then @@ -389,6 +393,14 @@ fi # we do not configure the full gettext, as we consume it dynamically from C# AM_PO_SUBDIRS +if test "x$USE_NLS" = "xyes"; then + AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no) + + if test "x$HAVE_MSGFMT" = "xno"; then + AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.]) + fi +fi + AC_ARG_WITH([libgdiplus], [ --with-libgdiplus=installed|sibling| Override the libgdiplus used for System.Drawing tests (defaults to NO)], [], [with_libgdiplus=installed]) @@ -540,7 +552,7 @@ 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, jit.], + 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'" @@ -575,6 +587,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 @@ -597,12 +614,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) {} @@ -1254,6 +1279,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 ******************************** @@ -1423,12 +1451,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 @@ -1449,11 +1482,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 *** @@ -1551,6 +1593,9 @@ if test "x$ac_cv_truncl" != "xyes"; then AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"]) fi +AC_CHECK_FUNCS(round) +AC_CHECK_FUNCS(rint) + dnl **************************** dnl *** Look for /dev/random *** dnl **************************** @@ -1636,10 +1681,14 @@ 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) -AC_MSG_RESULT($enable_big_arrays) 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 *** @@ -1709,6 +1758,8 @@ SQLITE="libsqlite.so.0" SQLITE3="libsqlite3.so.0" X11="libX11.so" +sizeof_register="SIZEOF_VOID_P" + jit_wanted=false interp_wanted=false case "$host" in @@ -1722,6 +1773,20 @@ case "$host" in ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes jit_wanted=true + + AC_MSG_CHECKING(for mips n32) + AC_TRY_COMPILE([], [ + void main () { + #if _MIPS_SIM != _ABIN32 + #error Not mips n32 + #endif + } + ],[ + AC_MSG_RESULT(yes) + sizeof_register=8 + ],[ + AC_MSG_RESULT(no) + ]) ;; i*86-*-*) TARGET=X86; @@ -1830,8 +1895,11 @@ case "$host" in powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* ) if test "x$ac_cv_sizeof_void_p" = "x8"; then TARGET=POWERPC64; + CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__" + CFLAGS="$CFLAGS -mminimal-toc" else TARGET=POWERPC; + CPPFLAGS="$CPPFLAGS -D__mono_ppc__" fi AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters]) arch_target=ppc; @@ -1874,6 +1942,14 @@ case "$host" in ;; esac +if test "x$sizeof_register" = "x4"; then + AC_DEFINE(SIZEOF_REGISTER,4,[size of machine integer registers]) +elif test "x$sizeof_register" = "x8"; then + AC_DEFINE(SIZEOF_REGISTER,8,[size of machine integer registers]) +else + AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of machine integer registers]) +fi + if test "x$have_visibility_hidden" = "xyes"; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute]) fi @@ -2226,14 +2302,13 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser], ],[LN_S='$LN_S']) if test x$enable_quiet_build = xyes; then - AC_CONFIG_COMMANDS([quiet], [find mono libgc support -name Makefile -exec $shell $srcdir/scripts/patch-quiet.sh {} \;], [shell=$SHELL]) + 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 @@ -2265,7 +2340,6 @@ 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 @@ -2282,11 +2356,17 @@ 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 +data/system.web.extensions_1.0.pc +data/system.web.extensions.design_1.0.pc samples/Makefile support/Makefile data/config @@ -2294,6 +2374,7 @@ tools/Makefile tools/locale-builder/Makefile runtime/Makefile msvc/Makefile +po/Makefile ]) if test x$platform_win32 = xyes; then @@ -2348,6 +2429,14 @@ fi echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make fi + if test x$platform_darwin = xyes; then + echo "PLATFORM = darwin" >> $srcdir/$mcsdir/build/config.make + fi + + if test x$TARGET = xAMD64 -a x$platform_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then + echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make + fi + # if we have an olive folder, override the default settings if test -d $olivedir; then @@ -2389,7 +2478,7 @@ echo " " if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then - AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs) + AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs) fi if test x$gc = xsgen; then