2005-04-08 Alp Toker <alp@atoker.com>
[mono.git] / configure.in
index 5af998712d2cbc6c3b6f1e2a36495be65b31f00c..70e9e0f6f51b1fa99857c91078dfe5d27bf3e042 100644 (file)
@@ -1,11 +1,23 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
+
+# Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
+# The extra brackets are to foil regex-based scans.
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
+
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.1)
+AM_INIT_AUTOMAKE(mono,1.1.7)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
 
+# In case of cygwin, override LN_S, irrespective of what it determines.
+# The build uses cygwin, but the actual runtime doesn't.
+case $host_os in
+*cygwin* ) LN_S='cp -p';;
+esac
+
+
 dnl
 dnl libgc checks
 dnl
@@ -42,7 +54,7 @@ case "$host" in
        *-*-mingw*|*-*-cygwin*)
                platform_win32=yes
                AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
-               CC="gcc -mno-cygwin"
+               CC="gcc -mno-cygwin -g"
                HOST_CC="gcc"
                # So libgc configure gets -mno-cygwin
                export CC
@@ -51,11 +63,10 @@ case "$host" in
                CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
                libdl=
                libgc_threads=win32
-               gc_default=boehm 
-               with_nptl=no
+               gc_default=included
+               with_nptl=default
                with_sigaltstack=no
                LN_S=cp
-
                ;;
        *-*-*netbsd*)
                platform_win32=no
@@ -229,13 +240,36 @@ 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)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h)
+
+AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
+
+AM_CONDITIONAL(HAVE_ZLIB, test x$have_zlib = xyes)
 
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
 
+# for support
+AC_CHECK_HEADERS(poll.h)
+AC_CHECK_HEADERS(sys/poll.h)
+AC_CHECK_HEADERS(sys/wait.h)
+AC_CHECK_HEADERS(grp.h)
+AC_CHECK_HEADERS(syslog.h)
+
 # for mono/dis
 AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_MSG_CHECKING(for isinf)
+AC_TRY_LINK([#include <math.h>], [
+       int f = isinf (1);
+], [
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_ISINF, 1, [isinf available])
+], [
+       # We'll have to use signals
+       AC_MSG_RESULT(no)
+])
+
 
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
@@ -245,6 +279,18 @@ if test x"$GCC" = xyes; then
         WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
                # The runtime code does not respect ANSI C strict aliasing rules
                CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+               ORIG_CFLAGS=$CFLAGS
+               CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+               AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
+               AC_TRY_COMPILE([], [
+                                                  void main () { }
+               ], [
+                  AC_MSG_RESULT(yes)
+               ], [
+                  AC_MSG_RESULT(no)
+                  CFLAGS=$ORIG_CFLAGS
+               ])
 else
        # The Sun Forte compiler complains about inline functions that access static variables
        # so disable all inlining.
@@ -256,6 +302,31 @@ else
 fi
 CFLAGS="$CFLAGS -g $WARN"
 
+# Where's the 'mcs' source tree?
+if test -d $srcdir/mcs; then
+  mcsdir=mcs
+else
+  mcsdir=../mcs
+fi
+
+mcs_topdir='$(top_srcdir)/'$mcsdir
+mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir
+
+AC_SUBST([mcs_topdir])
+AC_SUBST([mcs_topdir_from_srcdir])
+
+AC_ARG_WITH([libgdiplus], 
+       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
+       [], [with_libgdiplus=installed])
+
+case $with_libgdiplus in
+no|installed) libgdiplus_loc= ;;
+yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
+/*) libgdiplus_loc=$with_libgdiplus ;;
+*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
+esac
+AC_SUBST([libgdiplus_loc])
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
        AC_MSG_ERROR([You need to install pkg-config])
@@ -268,15 +339,15 @@ BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
 AC_SUBST(BUILD_GLIB_CFLAGS)
 AC_SUBST(BUILD_GLIB_LIBS)
 
-PKG_PATH=
+pkg_config_path=
 AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir],
        if test x$with_crosspkgdir = "x"; then
                if test -s $PKG_CONFIG_PATH; then
-                       PKG_PATH=$PKG_CONFIG_PATH
+                       pkg_config_path=$PKG_CONFIG_PATH
                fi
        else
-               PKG_PATH=$with_crosspkgdir
-               PKG_CONFIG_PATH=$PKG_PATH
+               pkg_config_path=$with_crosspkgdir
+               PKG_CONFIG_PATH=$pkg_config_path
                export PKG_CONFIG_PATH
        fi
 )
@@ -296,6 +367,27 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
+if test x$platform_win32 = xyes; 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)
+         AC_MSG_ERROR([Mono cannot be built with the cygwin glib2-devel package installed, because that package doesn't work with -mno-cygwin. Please uninstall it then re-run configure.])
+   else
+      AC_MSG_RESULT(not found, ok)
+   fi
+
+   AC_MSG_CHECKING(for broken gwin32.h)
+   glib_include=`$PKG_CONFIG --cflags-only-I glib-2.0 | sed -e 's/ -I.*//g' | sed -e 's/-I//g'`
+   if test -f $glib_include/glib/gwin32.h; then
+         if [ grep ftruncate $glib_include/glib/gwin32.h | grep -q define ]; then
+                AC_MSG_RESULT(failed)
+                hashmark='#'
+                AC_MSG_ERROR([Your version of gwin32.h is broken and will cause compilation errors when building mono. Please fix it by deleting the line: '$hashmark   define ftruncate...' from '$glib_include/glib/gwin32.h' then re-run configure.])
+         fi
+   fi
+   AC_MSG_RESULT(ok)
+fi
+
 AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
 
 # Enable support for fast thread-local storage
@@ -320,16 +412,51 @@ fi
 # 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])
 
-# assembly bundle support, see metadata/make-bundle.pl for more info
-AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
-       BUNDLE_FILE=$with_bundle
-       AC_SUBST(BUNDLE_FILE)
-       AC_DEFINE(WITH_BUNDLE)
-],[with_bundle=no])
-AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno)
+AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster)],[],[with_static_mono=yes])
+
+if test "x$enable_static" = "xno"; then
+   with_static_mono=no
+fi
+
+AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
+
+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.],
+[
+       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="Disabled:    $enable_minimal"
+],[])
+
+if test "x$mono_feature_disable_aot" = "xyes"; then
+       AC_DEFINE(DISABLE_AOT, 1, [Disable AOT support])
+fi
+
+if test "x$mono_feature_disable_profiler" = "xyes"; then
+       AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
+fi
+
+if test "x$mono_feature_disable_decimal" = "xyes"; then
+       AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
+fi
+
+if test "x$mono_feature_disable_pinvoke" = "xyes"; then
+       AC_DEFINE(DISABLE_PINVOKE, 1, [Disable P/Invoke support])
+fi
+
+if test "x$mono_feature_disable_debug" = "xyes"; then
+       AC_DEFINE(DISABLE_DEBUG, 1, [Disable runtime debugging support])
+fi
+
+if test "x$mono_feature_disable_reflection_emit" = "xyes"; then
+       AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support])
+fi
 
 LIBGC_CFLAGS=
 LIBGC_LIBS=
+LIBGC_STATIC_LIBS=
 libgc_dir=
 case "x$gc" in
        xboehm|xbohem|xyes)
@@ -346,6 +473,7 @@ case "x$gc" in
                AC_DEFINE(HAVE_BOEHM_GC)
                AC_SUBST(HAVE_BOEHM_GC)
                LIBGC_LIBS="-lgc $libdl"
+               LIBGC_STATIC_LIBS="$LIBGC_LIBS"
 
                # AC_CHECK_FUNCS does not work for some reason...
                AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
@@ -368,6 +496,7 @@ case "x$gc" in
 
                LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include'
                LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
+               LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
 
                AC_DEFINE(HAVE_BOEHM_GC)
                AC_SUBST(HAVE_BOEHM_GC)
@@ -395,6 +524,7 @@ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
 AC_SUBST(LIBGC_CFLAGS)
 AC_SUBST(LIBGC_LIBS)
+AC_SUBST(LIBGC_STATIC_LIBS)
 AC_SUBST(libgc_dir)
 
 dnl
@@ -406,56 +536,15 @@ if test x$platform_win32 = xno; then
        dnl ******************************************************************
        dnl *** Checks for the IKVM JNI interface library                  ***
        dnl ******************************************************************
-       AC_ARG_WITH(ikvm-jni, [  --with-ikvm-jni=yes,no  build the IKVM JNI interface library],[with_ikvm_jni=$withval],[with_ikvm_jni=yes])
-       AC_ARG_WITH(jdk, [  --with-jdk=DIRECTORY    Use JDK from DIRECTORY],[with_jdk_dir=$withval],[with_jdk_dir=])
-
-       ikvm_jni_dir=
-       if test x$with_ikvm_jni = xyes; then
-               AC_MSG_CHECKING([JDK headers])
-
-               if test x$with_jdk_dir = x; then
-                       # Try JAVA_HOME variable
-                       if test x$JAVA_HOME != x; then
-                               with_jdk_dir=$JAVA_HOME
-                       fi
-               fi
-       
-               jdk_platform=
-               if test -d $with_jdk_dir/include; then
-                       jdk_headers_found=yes
+       AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no  build the IKVM JNI interface library],[with_ikvm_native=$withval],[with_ikvm_native=yes])
 
-                       if test -d $with_jdk_dir/include/linux; then
-                               jdk_platform=linux
-                       else
-                       if test -d $with_jdk_dir/include/solaris; then
-                               jdk_platform=solaris
-                       else
-                       if test -f $with_jdk_dir/include/jni_md.h; then
-                               # GNU Classpath sources
-                               jdk_platform=
-                       else
-                               jdk_headers_found=no
-                       fi
-                       fi
-                       fi
-               else
-                       jdk_headers_found=no
-               fi
-
-               if test x$jdk_headers_found = xyes; then
-                       AC_MSG_RESULT($with_jdk_dir/include $with_jdk_dir/include/$jdk_platform)
-               else
-                       AC_MSG_RESULT(not found)
-               fi
-
-               if test x$jdk_headers_found = xyes; then
-                       ikvm_jni_dir=ikvm-jni
-                       IKVM_JNI_CFLAGS="-I$with_jdk_dir/include -I$with_jdk_dir/include/$jdk_platform"
-               fi
+       ikvm_native_dir=
+       if test x$with_ikvm_native = xyes; then
+               ikvm_native_dir=ikvm-native
+               jdk_headers_found="IKVM Native"
        fi
 
-       AC_SUBST(ikvm_jni_dir)
-       AC_SUBST(IKVM_JNI_CFLAGS)
+       AC_SUBST(ikvm_native_dir)
 
        AC_CHECK_FUNCS(getgrgid_r)
        AC_CHECK_FUNCS(getgrnam_r)
@@ -464,6 +553,7 @@ if test x$platform_win32 = xno; then
        AC_CHECK_FUNCS(getresuid)
        AC_CHECK_FUNCS(setresuid)
        AC_CHECK_FUNCS(kqueue)
+       AC_CHECK_FUNCS(backtrace_symbols)
 
        dnl ******************************************************************
        dnl *** Check for large file support                               ***
@@ -817,23 +907,23 @@ if test x$platform_win32 = xno; then
 
                                sa.sa_sigaction = sigsegv_signal_handler;
                                sigemptyset (&sa.sa_mask);
-                               sa.sa_flags = SA_SIGINFO | SA_STACK;
+                               sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
                                if (sigaction (SIGSEGV, &sa, NULL) == -1) {
-                                       perror ("lala");
+                                       perror ("sigaction");
                                        return;
                                }
 
                                sas.ss_sp = malloc (SIGSTKSZ);
                                sas.ss_size = SIGSTKSZ;
-                               sas.ss_flags = SS_ONSTACK;
+                               sas.ss_flags = 0;
                                if (sigaltstack (&sas, NULL) == -1) {
-                                       perror ("lala");
+                                       perror ("sigaltstack");
                                        return;
                                }
 
                                pthread_attr_init (&attr);
                                if (pthread_create(&id, &attr, loop, &attr) != 0) {
-                                       printf ("failed\n");
+                                       printf ("pthread_create\n");
                                        return;
                                }
 
@@ -945,44 +1035,54 @@ if test x$platform_win32 = xno; then
                AC_MSG_RESULT(no)
        ]) 
 
-       dnl *********************
-       dnl *** Check for AIO ***
-       dnl *********************
-       AC_MSG_CHECKING([for SIGEV_THREAD definition])
-       dnl Some systems (FreeBSD at least) may have aio_read
-       dnl but don't support/define SIGEV_THREAD.
-       AC_TRY_COMPILE([
-       #include <sys/signal.h>
-       ],[
-       int x = SIGEV_THREAD;
-       ],[
-               ac_cv_c_sigev_thread=yes
-               AC_MSG_RESULT(yes)
-       ],[
-               AC_MSG_RESULT(no)
-       ])
+       dnl **********************************
+       dnl *** Checks for MonoPosixHelper ***
+       dnl **********************************
+       AC_CHECK_HEADERS(checklist.h)
+       AC_CHECK_HEADERS(fstab.h)
+       AC_CHECK_HEADERS(sys/sendfile.h)
+       AC_CHECK_HEADERS(sys/statvfs.h)
+       AC_CHECK_HEADERS(sys/vfstab.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(posix_fadvise)
+       AC_CHECK_FUNCS(posix_fallocate)
+       AC_CHECK_FUNCS(posix_madvise)
+       AC_CHECK_FUNCS(vsnprintf)
+       AC_CHECK_FUNCS(sendfile)
+       AC_CHECK_FUNCS(sethostid)
+       AC_CHECK_FUNCS(statfs)
+       AC_CHECK_FUNCS(fstatfs)
+       AC_CHECK_FUNCS(statvfs)
+       AC_CHECK_FUNCS(fstatvfs)
+       AC_CHECK_FUNCS(stime)
+       AC_CHECK_FUNCS(strerror_r)
+       AC_CHECK_FUNCS(ttyname_r)
+       AC_CHECK_SIZEOF(size_t)
+       AC_CHECK_MEMBERS(
+               [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, 
+               [#include <sys/types.h>
+                #include <dirent.h>])
 
-       if test "$ac_cv_c_sigev_thread" = "yes" ; then
-               AC_CHECK_HEADERS(aio.h sys/aio.h)
-               AC_CHECK_LIB(rt, aio_read, [ LIBS="$LIBS -lrt" ],)
-               SIGVAL_PTR="undefined"
-               if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" ; then
-                       AC_CHECK_MEMBER(union sigval.sigval_ptr,SIGVAL_PTR="sigval_ptr",, [
-                                       #include <sys/signal.h>
-                                       ])
-                       AC_CHECK_MEMBER(union sigval.sival_ptr,SIGVAL_PTR="sival_ptr",, [
-                                       #include <sys/signal.h>
-                                       ])
-                       if test "$SIGVAL_PTR" = "undefined" ; then
-                               AC_MSG_ERROR([Unable to detect field name in 'union sigval'])
-                       fi
-               fi
-               AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
-       fi
+       dnl *********************************
+       dnl *** Check for Console 2.0 I/O ***
+       dnl *********************************
+       AC_CHECK_HEADERS([curses.h])
+       AC_CHECK_HEADERS([term.h], [], [],
+       [#if HAVE_CURSES_H
+        #include <curses.h>
+        #endif
+       ])
+       AC_CHECK_HEADERS([termios.h])
 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?))
 
        dnl *********************************
        dnl *** Check for struct ip_mreqn ***
@@ -1028,6 +1128,18 @@ ac_cv_c_socklen_t=yes
        AC_MSG_RESULT(no)
 ])
 
+AC_MSG_CHECKING(for array element initalizer support)
+AC_TRY_COMPILE([#include <sys/socket.h>], [
+       const int array[] = {[1] = 2,};
+], [
+       # Yes, we have it...
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_ARRAY_ELEM_INIT,1,[Supports C99 array initialization])
+], [
+       # We'll have to use signals
+       AC_MSG_RESULT(no)
+])
+
 AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
        # Simply calling trunc (0.0) is no good since gcc will optimize the call away
        AC_TRY_LINK([#include <math.h>], 
@@ -1122,23 +1234,25 @@ fi
 #
 ICU_CFLAGS=""
 ICU_LIBS=""
-enable_icu=no
+enable_glob="normal;  default"
 
-probe_icu=true
+probe_icu=false
 AC_ARG_WITH(icu, [  --with-icu=yes/no],
        if test x$with_icu = xno; then
           probe_icu=false;
           AC_MSG_RESULT(Will not probe for ICU)
        fi
+       if test x$with_icu = xyes; then
+          probe_icu=true;
+       fi
 )
 
 if $probe_icu; then
        AC_PATH_PROG(ICU_CONFIG, icu-config, no)
        if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
-               AC_MSG_WARN([Only invariant locale available; install ICU for I18N support])
-               enable_icu="no, if you want full i18n support download it from: http://oss.software.ibm.com/icu/index.html"
+               enable_glob="ICU not found, using non-ICU globalization code."
        else
-               enable_icu="yes. Version: `$ICU_CONFIG --version`"
+               enable_glob="ICU, unsupported. Version: `$ICU_CONFIG --version`"
                AC_DEFINE(HAVE_ICU)
                ICU_CFLAGS=`$ICU_CONFIG --cppflags`
                ICU_LIBS=`$ICU_CONFIG --ldflags`
@@ -1147,14 +1261,19 @@ fi
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
 
+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])
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
 JIT_SUPPORTED=no
+INTERP_SUPPORTED=no
 LIBC="libc.so.6"
 INTL="libc.so.6"
 
 jit_wanted=false
+interp_wanted=false
 case "$host" in
 #      mips-sgi-irix5.* | mips-sgi-irix6.*)
 #              TARGET=MIPS;
@@ -1184,13 +1303,21 @@ case "$host" in
                LIBC="libc.so"
                INTL="libintl.so"
                jit_wanted=true
+               if test x"$GCC" = xyes; then
+                       CFLAGS="$CFLAGS -Wno-cast-align"
+               fi
                ;;
        alpha*-*-linux* | alpha*-*-osf*)
                TARGET=ALPHA;
                ACCESS_UNALIGNED="no"
                JIT_SUPPORTED=no
+               INTERP_SUPPORTED=yes
+               interp_wanted=true
                arch_target=alpha;
               ;;
+       *-*-mingw*|*-*-cygwin*)
+               INTL="intl"
+               ;;
 #      ia64-*-linux* | ia64-*-hpux*)
 #              TARGET=IA64;
 #              arch_target=ia64;
@@ -1209,15 +1336,20 @@ case "$host" in
                arch_target=hppa; 
                LIBC="libc.sl"
                ACCESS_UNALIGNED="no"
+               INTERP_SUPPORTED=yes
+               interp_wanted=true
                ;;
        hppa*linux*)
                TARGET=HPPA;
                arch_target=hppa; 
                ACCESS_UNALIGNED="no"
+               INTERP_SUPPORTED=yes
+               interp_wanted=true
                ;;
        macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
         powerpc-*-sysv* | powerpc-*-darwin*)
                TARGET=POWERPC;
+               AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
                arch_target=ppc;
                JIT_SUPPORTED=yes
                jit_wanted=true
@@ -1226,15 +1358,19 @@ case "$host" in
                TARGET=ARM;
                arch_target=arm;
                ACCESS_UNALIGNED="no"
+               INTERP_SUPPORTED=yes
+               interp_wanted=true
                ;;
        s390-*-linux*)
                TARGET=S390;
+               AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
                arch_target=s390;
                ACCESS_UNALIGNED="no"
                JIT_SUPPORTED=yes
                ;;
        s390x-*-linux*)
                TARGET=S390x;
+               AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
                arch_target=s390x;
                ACCESS_UNALIGNED="no"
                JIT_SUPPORTED=yes
@@ -1242,7 +1378,19 @@ case "$host" in
 esac
 
 AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that default to the JIT],[
-       jit_wanted=true
+       if test x$withval = xyes; then
+          jit_wanted=true
+       else
+          jit_wanted=false
+       fi
+])
+
+AC_ARG_WITH(interp, [  --with-interp=yes,no    If you want to build scripts that default to the interpreter],[
+       if test x$withval = xyes; then
+          interp_wanted=true
+       else
+          interp_wanted=false
+       fi
 ])
 
 USEJIT=false
@@ -1251,10 +1399,18 @@ if test x$JIT_SUPPORTED = xyes; then
       USEJIT=true
       jit_status="Building and using the JIT"
    else
-      jit_status="Building the JIT, defaulting to the interpreter"
+      if $interp_wanted; then
+         jit_status="Building the JIT, defaulting to the interpreter"
+      else
+         AC_ERROR(No JIT or interpreter support available or selected.)
+      fi
    fi
 else
-   jit_status="interpreter"
+   if $interp_wanted; then
+      jit_status="interpreter"
+   else
+      AC_ERROR(No JIT or interpreter support available or selected.)
+   fi
 fi
 
 AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
@@ -1271,6 +1427,14 @@ case "$host" in
        LIBC="libc.so.12"
        INTL="libintl.so.0"
        ;;
+    *-*-*freebsd*)
+       LIBC="libc.so"
+       INTL="libintl.so"
+       ;;
+    *-*-*openbsd*)
+       LIBC="libc.so"
+       INTL="libintl.so"
+       ;;
 esac
 AC_SUBST(libsuffix)
 
@@ -1287,7 +1451,7 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
                # undefined reference to `__tls_get_addr'
                #
                rm -f conftest.c conftest.so conftest
-               echo "static __thread int foo; void bar () { foo = 5 };" > conftest.c
+               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
                if test ! -f conftest; then
@@ -1300,6 +1464,17 @@ fi
 
 if test "x$with_tls" = "x__thread"; then
        AC_DEFINE(HAVE_KW_THREAD)
+   # 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")));], [
+               ], [
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_TLS_MODEL_ATTR, 1, [tld_model available])
+               ], [
+                       AC_MSG_RESULT(no)
+       ])
 fi
 
 if test ${TARGET} = ARM; then
@@ -1330,7 +1505,7 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
-PREVIEW=no
+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 = xyes; then
              PREVIEW=yes
@@ -1355,6 +1530,8 @@ AM_CONDITIONAL(S390x, test x$TARGET = xS390x)
 AM_CONDITIONAL(HPPA, test x$TARGET = xHPPA)
 
 AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
+AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
+AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
 
 AC_SUBST(LIBC)
 AC_SUBST(INTL)
@@ -1364,10 +1541,59 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
+mono_build_root=`pwd`
+AC_SUBST(mono_build_root)
+
+if test x$USEJIT = xtrue; then
+  mono_runtime=mono/mini/mono
+else
+  mono_runtime=mono/interpreter/mint
+fi
+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
+else
+  mono_cfg_dir=$mono_cfg_root/etc
+fi
+AC_SUBST(mono_cfg_dir)
+
+AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
+    cd runtime/etc/mono/1.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_1_1/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.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 machine.config
+    $LN_S $reldir/data/net_2_0/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
 AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+scripts/mono-nunit.pc
 mono/Makefile
 mono/utils/Makefile
 mono/metadata/Makefile
@@ -1396,10 +1622,7 @@ mono/io-layer/Makefile
 mono/handles/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
-ikvm-jni/Makefile
-runtime/Makefile
-runtime/net_1_1/Makefile
-runtime/net_2_0/Makefile
+ikvm-native/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile
@@ -1413,16 +1636,35 @@ data/config
 mono.spec
 tools/Makefile
 tools/locale-builder/Makefile
+runtime/Makefile
 ])
 
-echo "
+(
+  case $prefix in
+  NONE) prefix=/usr/local ;;
+  esac
+  case $exec_prefix in
+  NONE | '${prefix}') exec_prefix=$prefix ;;
+  esac
+
+  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
+)
+
+libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
 
+echo "
+        mcs source:  $mcs_topdir
        GC:          $gc
-       ICU:         $enable_icu
+       Globalization:     $enable_glob
        TLS:         $with_tls
        SIGALTSTACK: $with_sigaltstack
        Engine:      $jit_status
        2.0 Alpha:   $PREVIEW
        JNI support: $jdk_headers_found
+       libgdiplus:  $libgdiplus_msg
+       $disabled
 
 "