2006-02-01 Chris Toshok <toshok@ximian.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index fbe5f6df00cec6fee4bb1a50d16b235547ecdcb2..87b91f475d828ecbdb16f5af47e55888c2f8df5c 100644 (file)
--- 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.11)
+AM_INIT_AUTOMAKE(mono,1.1.13)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -249,12 +249,15 @@ 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)
 
@@ -1202,12 +1205,14 @@ if test x$platform_win32 = xno; then
        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)
@@ -1427,6 +1432,11 @@ case "$host" in
                arch_target=x86;
                JIT_SUPPORTED=yes
                jit_wanted=true
+               case $host_os in
+                 solaris*)
+                       LIBC="libc.so"
+                       INTL="libintl.so"
+               esac
                ;;
        x86_64-*-* | amd64-*-*)
                TARGET=AMD64;
@@ -1441,6 +1451,7 @@ case "$host" in
                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"
                ;;
@@ -1632,6 +1643,22 @@ 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
+       case "$host" in
+       *-*-*linux*)
+               mono_debugger_supported=yes
+               ;;
+       esac
+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