* configure.in: Add checks for getdomainname and setdomainname.
[mono.git] / configure.in
index af62fdb43bade9b3a44ffddb916e1f789c756094..63eb80be09ea0ac1b22a4174fdb5689bdaeb9180 100644 (file)
@@ -1,9 +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,0.25.99.2)
+AM_INIT_AUTOMAKE(mono,1.1.3)
 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
@@ -27,21 +41,32 @@ libmono_ldflags=""
 AC_SUBST(libmono_cflags)
 AC_SUBST(libmono_ldflags)
 
+dnl if linker handles the version script
+no_version_script=no
+
+# Set to yes if Unix sockets cannot be created in an anonymous namespace
+need_link_unlink=no
+
 # Thread configuration inspired by sleepycat's db
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
 case "$host" in
        *-*-mingw*|*-*-cygwin*)
                platform_win32=yes
-               AC_DEFINE(PLATFORM_WIN32)
-               CC="gcc -mno-cygwin"
+               AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
+               CC="gcc -mno-cygwin -g"
                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"
                libdl=
                libgc_threads=win32
-               gc_default=boehm 
+               gc_default=included
+               with_nptl=default
+               with_sigaltstack=no
+               LN_S=cp
                ;;
        *-*-*netbsd*)
                platform_win32=no
@@ -49,47 +74,113 @@ case "$host" in
                libmono_cflags="-D_REENTRANT"
                LDFLAGS="$LDFLAGS -pthread"
                libmono_ldflags="-pthread"
-               AC_DEFINE(NEED_LINK_UNLINK)
+               need_link_unlink=yes
+               libdl=
+               libgc_threads=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
+               need_link_unlink=yes
+               AC_DEFINE(PTHREAD_POINTER_ID)
                libdl=
                libgc_threads=pthreads
+# TLS isn't implemented at all on -STABLE
+               with_nptl=no
+               with_tls=pthread
                ;;
-       *-*-*freebsd*|*-*-*openbsd*)
+# older versions of -CURRENT will break with these flags but testing
+# indicates these older versions won't run Mono anyway
+#
+       *-*-*freebsd5*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
+               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 -lpthread"
+                       libmono_ldflags="-lpthread"
+               else
+                       LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+                       libmono_ldflags="$PTHREAD_LIBS"
+               fi
+               need_link_unlink=yes
+               AC_DEFINE(PTHREAD_POINTER_ID)
+               libdl=
+               libgc_threads=pthreads
+# TLS is only partially implemented on -CURRENT (compiler support
+# but NOT library support)
+#
+               with_nptl=no
+               with_tls=pthread
+               ;;
+       *-*-*openbsd*)
+               platform_win32=no
+               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
                libmono_cflags="-D_THREAD_SAFE"
                LDFLAGS="$LDFLAGS -pthread"
                libmono_ldflags="-pthread"
-               AC_DEFINE(NEED_LINK_UNLINK)
+               need_link_unlink=yes
                AC_DEFINE(PTHREAD_POINTER_ID)
                libdl=
                libgc_threads=pthreads
                ;;
        *-*-linux*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -DMONO_USE_EXC_TABLES -D_GNU_SOURCE -D_REENTRANT -fexceptions"
-               libmono_cflags="-DMONO_USE_EXC_TABLES -fexceptions -D_REENTRANT"
+               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+               libmono_cflags="-D_REENTRANT"
                libmono_ldflags="-lpthread"
                libdl="-ldl"
                libgc_threads=pthreads
                ;;
+        *-*-hpux*)
+                platform_win32=no
+               CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
+               CFLAGS="$CFLAGS +ESdbgasm"
+               LDFLAGS="$LDFLAGS -z"
+               libmono_cflags="-D_REENTRANT"
+               libmono_ldflags="-lpthread"
+               libgc_threads=pthreads
+               need_link_unlink=yes
+                ;;
        *-*-solaris*)
                platform_win32=no
                CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
-               AC_DEFINE(NEED_LINK_UNLINK)
+               need_link_unlink=yes
                libmono_cflags="-D_REENTRANT"
-               libgc_threads=solaris
+               libgc_threads=pthreads
                ;;
        *-*-darwin*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE"
+               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS"
                libmono_cflags="-D_THREAD_SAFE"
                LDFLAGS="$LDFLAGS -pthread"
                libmono_ldflags="-pthread"
-               AC_DEFINE(NEED_LINK_UNLINK)
+               need_link_unlink=yes
                AC_DEFINE(PTHREAD_POINTER_ID)
+               AC_DEFINE(USE_MACH_SEMA)
+               no_version_script=yes
                libdl=
-               libgc_threads=no
-               gc_default=none 
+               libgc_threads=pthreads
                ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -98,6 +189,11 @@ case "$host" in
                ;;
 esac
 AC_MSG_RESULT(ok)
+
+if test x$need_link_unlink = xyes; then
+   AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace])
+fi
+
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
@@ -135,18 +231,70 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
+# Test whenever ld supports -version-script
+AC_PROG_LD
+AC_PROG_LD_GNU
+if test "x$lt_cv_prog_gnu_ld" = "xno"; then
+   no_version_script=yes
+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_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 mono/dis
 AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_MSG_CHECKING(for isinf)
+AC_TRY_COMPILE([#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)
 
-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
+WARN=''
+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"
+else
+       # The Sun Forte compiler complains about inline functions that access static variables
+       # so disable all inlining.
+       case "$host" in
+       *-*-solaris*)
+               CFLAGS="$CFLAGS -Dinline="
+               ;;
+       esac
+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_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -155,8 +303,8 @@ fi
 
 dnl for use on the build system
 dnl pkg-config is stupid
-BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0`
-BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
+BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
+BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
 AC_SUBST(BUILD_GLIB_CFLAGS)
 AC_SUBST(BUILD_GLIB_LIBS)
 
@@ -178,8 +326,8 @@ GLIB_REQUIRED_VERSION=1.3.11
 
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
 
-GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0`
-GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
+GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
+GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
 GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
 GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
 
@@ -188,18 +336,96 @@ 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])
 
-# 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)
+# Enable support for fast thread-local storage
+# Some systems have broken support, so we allow to disable it.
+AC_ARG_WITH(tls, [  --with-tls=__thread,pthread       select Thread Local Storage implementation],[],[with_tls=__thread])
+
+# Kept for compatibility
+AC_ARG_WITH(nptl, [  --with-nptl=yes,no      deprecated, use --with-tls instead],[],[with_nptl=default])
+
+if test "x$with_nptl" != "xdefault"; then
+   if test "x$with_nptl" = "xyes"; then
+      AC_MSG_WARN([--with-nptl=yes is deprecated, use --with-tls=__thread option instead.])
+         with_tls=__thread
+   fi
+   if test "x$with_nptl" = "xno"; then
+      AC_MSG_WARN([--with-nptl=no is deprecated, use --with-tls=pthread option instead.])
+         with_tls=pthread
+   fi
+fi
+
+# Enable support for using sigaltstack for SIGSEGV and stack overflow handling
+# 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])
+
+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)
@@ -216,12 +442,17 @@ 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)
                if test "x$found_gcj_malloc" = "xyes"; then
                        AC_DEFINE(HAVE_GC_GCJ_MALLOC)
                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)
+               fi
                ;;
 
        xincluded)
@@ -234,6 +465,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)
@@ -243,6 +475,7 @@ case "x$gc" in
 
                # The included libgc contains GCJ support
                AC_DEFINE(HAVE_GC_GCJ_MALLOC)
+               AC_DEFINE(HAVE_GC_ENABLE)
                ;;
 
        xnone)
@@ -253,13 +486,14 @@ case "x$gc" in
                ;;
 esac
 
-we_are_embedded_in_mono=yes
-export we_are_embedded_in_mono
-export libgc_threads
+
+# tell libgc/configure about what we want
+ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$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
@@ -267,6 +501,15 @@ dnl End of libgc checks
 dnl
 
 if test x$platform_win32 = xno; then
+
+       AC_CHECK_FUNCS(getgrgid_r)
+       AC_CHECK_FUNCS(getgrnam_r)
+       AC_CHECK_FUNCS(getpwnam_r)
+       AC_CHECK_FUNCS(getpwuid_r)
+       AC_CHECK_FUNCS(getresuid)
+       AC_CHECK_FUNCS(setresuid)
+       AC_CHECK_FUNCS(kqueue)
+
        dnl ******************************************************************
        dnl *** Check for large file support                               ***
        dnl *** (If we were using autoconf 2.50 we'd use AC_SYS_LARGEFILE) ***
@@ -349,6 +592,21 @@ if test x$platform_win32 = xno; then
                AC_MSG_RESULT(no)
        ])
 
+       dnl *****************************
+       dnl *** Checks for SOL_IPV6     ***
+       dnl *****************************
+       AC_MSG_CHECKING(for SOL_IPV6)
+       AC_TRY_COMPILE([#include <netdb.h>], [
+               int level = SOL_IPV6;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SOL_IPV6)
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
        dnl *****************************
        dnl *** Checks for SOL_TCP    ***
        dnl *****************************
@@ -410,12 +668,14 @@ if test x$platform_win32 = xno; then
        dnl *** Check for gethostbyname2_r ***
        dnl **********************************
        AC_MSG_CHECKING(for gethostbyname2_r)
-               AC_TRY_COMPILE([#include <netdb.h>], [
+               AC_TRY_LINK([#include <netdb.h>], [
                gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL);
        ], [
                # Yes, we have it...
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_GETHOSTBYNAME2_R)
+       ], [
+               AC_MSG_RESULT(no)
        ])
 
        dnl *****************************
@@ -449,6 +709,23 @@ if test x$platform_win32 = xno; then
        AC_MSG_RESULT($cv_mono_sizeof_sunpath)
        AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
 
+       dnl *************************************
+       dnl *** Checks for zero length arrays ***
+       dnl *************************************
+       AC_MSG_CHECKING(whether $CC supports zero length arrays)
+       AC_TRY_COMPILE([
+                struct s {
+                        int  length;
+                        char data [0];
+                };
+        ], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 0)
+       ], [
+               AC_MSG_RESULT(no)
+               AC_DEFINE_UNQUOTED(MONO_ZERO_ARRAY_LENGTH, 1)
+       ])
+
        dnl *****************************
        dnl *** Checks for libxnet    ***
        dnl *****************************
@@ -474,8 +751,20 @@ if test x$platform_win32 = xno; then
        dnl *****************************
        dnl *** Checks for libpthread ***
        dnl *****************************
-       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+# on FreeBSD -STABLE, the pthreads functions all reside in libc_r
+# and libpthread does not exist
+#
+       case "${host}" in
+               *-*-*freebsd4*)
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+               ;;
+               *)
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+               ;;
+       esac
+       AC_CHECK_HEADERS(pthread.h)
        AC_CHECK_FUNCS(pthread_mutex_timedlock)
+       AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np)
        AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
        AC_TRY_COMPILE([ #include <pthread.h>], [
                pthread_mutexattr_t attr;
@@ -487,11 +776,159 @@ if test x$platform_win32 = xno; then
                AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
                AC_DEFINE(USE_MONO_MUTEX)
        ])
+       AC_CHECK_FUNCS(pthread_attr_setstacksize)
+
+       dnl ***********************************
+       dnl *** Checks for working __thread ***
+       dnl ***********************************
+       AC_MSG_CHECKING(for working __thread)
+       if test "x$with_tls" != "x__thread"; then
+               AC_MSG_RESULT(disabled)
+       else
+               AC_TRY_RUN([
+                       #include <pthread.h>
+
+                       __thread int i;
+                       static int res1, res2;
+
+                       void thread_main (void *arg)
+                       {
+                               i = arg;
+                               sleep (1);
+                               if (arg == 1)
+                                       res1 = (i == arg);
+                               else
+                                       res2 = (i == arg);
+                       }
+
+                       int main () {
+                               pthread_t t1, t2;
+
+                               i = 5;
+
+                               pthread_create (&t1, NULL, thread_main, 1);
+                               pthread_create (&t2, NULL, thread_main, 2);
+
+                               pthread_join (t1, NULL);
+                               pthread_join (t2, NULL);
+
+                               return !(res1 + res2 == 2);
+                       }
+               ], [
+                               AC_MSG_RESULT(yes)
+               ], [
+                               AC_MSG_RESULT(no)
+                               with_tls=pthread
+               ])
+       fi
+
+       dnl **************************************
+       dnl *** Checks for working sigaltstack ***
+       dnl **************************************
+       AC_MSG_CHECKING(for working sigaltstack)
+       if test "x$with_sigaltstack" != "xyes"; then
+               AC_MSG_RESULT(disabled)
+       else
+               AC_TRY_RUN([
+                       #include <stdio.h>
+                       #include <stdlib.h>
+                       #include <unistd.h>
+                       #include <signal.h>
+                       #include <pthread.h>
+                       #include <sys/wait.h>
+
+                       static void
+                       sigsegv_signal_handler (int _dummy, siginfo_t *info, void *context)
+                       {
+                               exit (0);
+                       }
+
+                       static void *
+                       loop (void *ignored)
+                       {
+                               char *ptr = NULL;
+
+                               *ptr = 0;
+                               return NULL;
+                       }
+
+                       static void
+                       child ()
+                       {
+                               struct sigaction sa;
+                               struct sigaltstack sas;
+                               pthread_t id;
+                               pthread_attr_t attr;
+
+                               sa.sa_sigaction = sigsegv_signal_handler;
+                               sigemptyset (&sa.sa_mask);
+                               sa.sa_flags = SA_SIGINFO | SA_STACK;
+                               if (sigaction (SIGSEGV, &sa, NULL) == -1) {
+                                       perror ("lala");
+                                       return;
+                               }
+
+                               sas.ss_sp = malloc (SIGSTKSZ);
+                               sas.ss_size = SIGSTKSZ;
+                               sas.ss_flags = SS_ONSTACK;
+                               if (sigaltstack (&sas, NULL) == -1) {
+                                       perror ("lala");
+                                       return;
+                               }
+
+                               pthread_attr_init (&attr);
+                               if (pthread_create(&id, &attr, loop, &attr) != 0) {
+                                       printf ("failed\n");
+                                       return;
+                               }
+
+                               sleep (100);
+                       }
+
+                       int
+                       main ()
+                       {
+                               pid_t son;
+                               int status;
+                               int i;
+
+                               son = fork ();
+                               if (son == -1) {
+                                       return 1;
+                               }
+
+                               if (son == 0) {
+                                       child ();
+                                       return 0;
+                               }
+
+                               for (i = 0; i < 3; ++i) {
+                                       sleep (1);
+                                       waitpid (son, &status, WNOHANG);
+                                       if (WIFEXITED (status) && WEXITSTATUS (status) == 0)
+                                               return 0;
+                               }
+
+                               kill (son, SIGKILL);
+                               return 1;
+                       }
+
+               ], [
+                               AC_MSG_RESULT(yes)
+                               AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+               ], [
+                               with_sigaltstack=no
+                               AC_MSG_RESULT(no)
+               ])
+       fi
 
        dnl ********************************
        dnl *** Checks for semaphore lib ***
        dnl ********************************
-       AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt")
+       # 'Real Time' functions on Solaris
+       # posix4 on Solaris 2.6
+       # pthread (first!) on Linux
+       AC_SEARCH_LIBS(sem_init, pthread rt posix4) 
 
        dnl ********************************
        dnl *** Checks for timezone stuff **
@@ -519,14 +956,180 @@ if test x$platform_win32 = xno; then
                fi
        fi
 
+       dnl *********************************
+       dnl *** Checks for math functions ***
+       dnl *********************************
+        LIBS="$LIBS -lm";
+        AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
+                AC_TRY_LINK([#include <math.h>], 
+                [ finite(0.0); ], 
+                AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
+                AC_MSG_RESULT(no)))
+        AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h)
+                AC_TRY_LINK([#include <math.h>], 
+                [ isfinite(0.0); ], 
+                AC_DEFINE(HAVE_ISFINITE) AC_MSG_RESULT(yes),
+                AC_MSG_RESULT(no)))
+
        dnl ****************************************************************
        dnl *** Checks for working poll() (macosx defines it but doesn't ***
        dnl *** have it in the library (duh))                            ***
        dnl ****************************************************************
        AC_CHECK_FUNCS(poll)
+
+       dnl *************************
+       dnl *** Check for signbit ***
+       dnl *************************
+       AC_MSG_CHECKING(for signbit)
+       AC_TRY_LINK([#include <math.h>], [
+               int s = signbit(1.0);
+       ], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SIGNBIT)
+       ], [
+               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)
+       ])
+
+       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 *** Checks for MonoPosixHelper ***
+       dnl **********************************
+       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(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>])
 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 ***
+       dnl *********************************
+       AC_MSG_CHECKING(for struct ip_mreqn)
+       AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+               struct ip_mreqn mreq;
+               mreq.imr_address.s_addr = 0;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_STRUCT_IP_MREQN)
+       ], [
+               # We'll just have to try and use struct ip_mreq
+               AC_MSG_RESULT(no)
+               AC_MSG_CHECKING(for struct ip_mreq)
+               AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+                       struct ip_mreq mreq;
+                       mreq.imr_interface.s_addr = 0;
+               ], [
+                       # Yes, we have it...
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+               ], [
+                       # No multicast support
+                       AC_MSG_RESULT(no)
+               ])
+       ])
+fi
+
+dnl socklen_t check
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+],[
+  socklen_t foo;
+],[
+ac_cv_c_socklen_t=yes
+       AC_DEFINE(HAVE_SOCKLEN_T)
+       AC_MSG_RESULT(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>], 
+       [ static void *p = &trunc; ],
+       [
+               AC_DEFINE(HAVE_TRUNC) 
+               AC_MSG_RESULT(yes)
+               ac_cv_trunc=yes
+       ],
+       AC_MSG_RESULT(no)))
+
+if test "x$ac_cv_truncl" != "xyes"; then
+   AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL) LIBS="$LIBS -lsunmath"])
 fi
 
 dnl ****************************
@@ -547,7 +1150,7 @@ case "{$target}" in
 dnl Win32 does not have /dev/random, they have their own method...
 
     *-*-mingw*|*-*-cygwin*)
-    ac_cv_have_dev_random = no
+    ac_cv_have_dev_random=no
     ;;
 
 dnl Everywhere else, it's /dev/random
@@ -590,7 +1193,8 @@ if test "x$ac_cv_have_dev_random" = "xno" \
 *** entropy collection in place, please contact <crichton@gimp.org> and
 *** provide information about the system and how to access the random device.
 ***
-*** For those systems who lack a random device, EGD support is forthcoming.
+*** Otherwise you can install either egd or prngd and set the environment
+*** variable MONO_EGD_SOCKET to point to the daemon's socket to use that.
 ***]])
 fi
  
@@ -602,22 +1206,263 @@ if test "x$try_shared_handles" != "xyes"; then
        AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
+#
+# ICU 
+#
+ICU_CFLAGS=""
+ICU_LIBS=""
+enable_icu="no;  default"
+
+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"
+       else
+               enable_icu="yes. Version: `$ICU_CONFIG --version`"
+               AC_DEFINE(HAVE_ICU)
+               ICU_CFLAGS=`$ICU_CONFIG --cppflags`
+               ICU_LIBS=`$ICU_CONFIG --ldflags`
+       fi
+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; ACCESS_UNALIGNED="no";;
-i*86-*-*) TARGET=X86; arch_target=x86; JIT_SUPPORTED=yes;;
-sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
-#alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";;
-#m68k-*-linux*) TARGET=M68K;;
-macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv* | powerpc-*-darwin*) TARGET=POWERPC; arch_target=ppc; JIT_SUPPORTED=yes;;
-arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
-s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";;
+#      mips-sgi-irix5.* | mips-sgi-irix6.*)
+#              TARGET=MIPS;
+#              ACCESS_UNALIGNED="no"
+#              ;;
+       i*86-*-*)
+               TARGET=X86;
+               arch_target=x86;
+               JIT_SUPPORTED=yes
+               jit_wanted=true
+               ;;
+       x86_64-*-* | amd64-*-*)
+               TARGET=AMD64;
+               arch_target=amd64;
+               JIT_SUPPORTED=yes
+               jit_wanted=true
+               ;;
+       sparc*-*-*)
+               if test "x$ac_cv_sizeof_void_p" = "x8"; then
+                  TARGET=SPARC64
+               else
+                       TARGET=SPARC
+               fi
+               arch_target=sparc;
+               JIT_SUPPORTED=yes
+               ACCESS_UNALIGNED="no"
+               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;
+              ;;
+#      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; 
+               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
+               ;;
+       arm-*-linux-* | armv4l-*-linux-*)
+               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
+               ;;
 esac
 
+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
+       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
+if test x$JIT_SUPPORTED = xyes; then
+   if $jit_wanted; then
+      USEJIT=true
+      jit_status="Building and using the JIT"
+   else
+      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
+   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)
+
+libsuffix=".so"
+
+case "$host" in
+     powerpc-*-darwin*)
+       libsuffix=".dylib"
+       LIBC="libc.dylib"
+       INTL="libintl.dylib"
+       ;;
+     *-*-*netbsd*)
+       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)
+
+if test "x$TARGET" != "xAMD64"; then
+   # valgrind headers don't compile under x86-64
+   AC_CHECK_HEADERS(valgrind/memcheck.h)
+fi
+
+if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
+       if test "x$with_tls" = "x__thread"; then
+               #
+               # On some linux distributions, TLS works in executables, but linking 
+               # against a shared library containing TLS fails with:
+               # undefined reference to `__tls_get_addr'
+               #
+               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
+               if test ! -f conftest; then
+                  AC_MSG_WARN([Disabling usage of __thread.]);
+                  with_tls=pthread
+               fi
+               rm -f conftest.c conftest.so conftest
+       fi
+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
+fi
+
+if test ${TARGET} = ARM; then
+       dnl ******************************************
+       dnl *** Check to see what FPU is available ***
+       dnl ******************************************
+       AC_MSG_CHECKING(which FPU to use)
+
+       AC_TRY_COMPILE([], [
+               __asm__ ("ldfd f0, [r0]");
+               ], fpu=FPA, [
+                       AC_TRY_COMPILE([], [
+                               __asm__ ("fldd d0, [r0]");
+                       ], fpu=VFP, fpu=NONE)
+               ])
+
+       AC_MSG_RESULT($fpu)
+       CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu"
+       unset fpu
+fi
+
 if test ${TARGET} = unknown; then
        CPPFLAGS="$CPPFLAGS -DNO_PORT"
        AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
@@ -627,28 +1472,93 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
+PREVIEW=no
+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
+       fi
+])
+
+AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
+
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
 AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
 AM_CONDITIONAL(X86, test x$TARGET = xX86)
+AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
 AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
+AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 AM_CONDITIONAL(S390, test x$TARGET = xS390)
+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)
 
-LIBC="libc.so.6"
 AC_SUBST(LIBC)
+AC_SUBST(INTL)
 
 AC_SUBST(arch_target)
 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
 mono/Makefile
 mono/utils/Makefile
@@ -660,13 +1570,17 @@ mono/os/Makefile
 mono/os/win32/Makefile
 mono/os/unix/Makefile
 mono/arch/x86/Makefile
+mono/arch/amd64/Makefile
+mono/arch/hppa/Makefile
 mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile
 mono/arch/s390/Makefile
+mono/arch/s390x/Makefile
 mono/arch/arm/Makefile
 mono/arch/alpha/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
+mono/tests/tests-config
 mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
@@ -674,17 +1588,43 @@ mono/io-layer/Makefile
 mono/handles/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
-runtime/Makefile
 scripts/Makefile
 man/Makefile
-doc/Makefile
+web/Makefile
 docs/Makefile
 data/Makefile
+data/net_1_1/Makefile
+data/net_2_0/Makefile
+samples/Makefile
+support/Makefile
+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=$exec_prefix" > $srcdir/$mcsdir/build/config.make
+  echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
+)
 
-       GC:     $gc
+echo "
+        mcs source:  $mcs_topdir
+       GC:          $gc
+       ICU:         $enable_icu
+       TLS:         $with_tls
+       SIGALTSTACK: $with_sigaltstack
+       Engine:      $jit_status
+       2.0 Alpha:   $PREVIEW
+       JNI support: $jdk_headers_found
+       $disabled
 
 "