Add 2.0 version attributes
[mono.git] / configure.in
index cfc5a897366f85d2c5ec13981e4305ca34026ec5..12626cccf579888022e084726f165f2f4b94f4a9 100644 (file)
@@ -1,9 +1,23 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.24)
+AM_INIT_AUTOMAKE(mono,0.31.99)
 AM_MAINTAINER_MODE
 
+dnl
+dnl libgc checks
+dnl
+
+gc_headers=no
+gc=included
+use_included_gc=no
+
+if test -d $srcdir/libgc ; then
+  gc_default=included
+else
+  gc_default=boehm
+fi
+
 #
 # These are the flags that need to be stored in the mono.pc file for 
 # compiling code that will embed Mono
@@ -13,6 +27,9 @@ libmono_ldflags=""
 AC_SUBST(libmono_cflags)
 AC_SUBST(libmono_ldflags)
 
+dnl if linker handles the version script
+no_version_script=no
+
 # Thread configuration inspired by sleepycat's db
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
@@ -22,9 +39,12 @@ case "$host" in
                AC_DEFINE(PLATFORM_WIN32)
                CC="gcc -mno-cygwin"
                HOST_CC="gcc"
-               CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
+# 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 
                ;;
        *-*-*netbsd*)
                platform_win32=no
@@ -55,12 +75,22 @@ case "$host" in
                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
+               AC_DEFINE(NEED_LINK_UNLINK)
+                ;;
        *-*-solaris*)
                platform_win32=no
                CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
                AC_DEFINE(NEED_LINK_UNLINK)
                libmono_cflags="-D_REENTRANT"
-               libgc_threads=solaris
+               libgc_threads=pthreads
                ;;
        *-*-darwin*)
                platform_win32=no
@@ -70,8 +100,11 @@ case "$host" in
                libmono_ldflags="-pthread"
                AC_DEFINE(NEED_LINK_UNLINK)
                AC_DEFINE(PTHREAD_POINTER_ID)
+               AC_DEFINE(USE_MACH_SEMA)
+               no_version_script=yes
                libdl=
                libgc_threads=no
+               gc_default=none 
                ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -86,6 +119,12 @@ AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
+dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
+: ${CCAS='$(CC)'}
+# Set ASFLAGS if not already set.
+: ${CCASFLAGS='$(CFLAGS)'}
+AC_SUBST(CCAS)
+AC_SUBST(CCASFLAGS)
 
 AC_CHECK_PROG(BISON, bison,yes,no)
 if test "x$BISON" = "xno";
@@ -111,8 +150,20 @@ 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)
 
+# for mono/mini/tramp-x86.c
+AC_CHECK_HEADERS(valgrind/memcheck.h)
+
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
 
@@ -122,7 +173,21 @@ AC_CHECK_HEADERS(wchar.h)
 # 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"
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -131,8 +196,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)
 
@@ -154,8 +219,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`
 
@@ -164,23 +229,24 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-dnl
-dnl libgc checks
-dnl
-
-AC_CONFIG_SUBDIRS(libgc)
+AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
 
-gc_headers=no
-gc=included
-use_included_gc=no
+# Enable support for NPTL only features like fast thread-local storage
+# We can't reliably detect nptl at compile & run time
+# so this option will stay until nptl becomes more widespread
+AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for NPTL],[],[with_nptl=yes])
 
-if test -d $srcdir/libgc ; then
-  gc_default=included
-else
-  gc_default=boehm
-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=yes])
 
-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)
 
 LIBGC_CFLAGS=
 LIBGC_LIBS=
@@ -191,7 +257,7 @@ case "x$gc" in
                AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
 
                if test "x$found_boehm" != "xyes"; then
-                       AC_MSG_ERROR("GC requested but libgc not found!")
+                       AC_MSG_ERROR("GC requested but libgc not found! Install libgc or run configure with --with-gc=none.")
                fi
                if test "x$gc_headers" != "xyes"; then
                        AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.")
@@ -201,10 +267,20 @@ case "x$gc" in
                AC_SUBST(HAVE_BOEHM_GC)
                LIBGC_LIBS="-lgc $libdl"
 
-               AC_CHECK_FUNCS(GC_gcj_malloc)
+               # 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)
+               AC_CONFIG_SUBDIRS(libgc)
+
                found_boehm=yes
                gc_headers=yes
                use_included_gc=yes
@@ -221,6 +297,7 @@ case "x$gc" in
 
                # The included libgc contains GCJ support
                AC_DEFINE(HAVE_GC_GCJ_MALLOC)
+               AC_DEFINE(HAVE_GC_ENABLE)
                ;;
 
        xnone)
@@ -245,6 +322,63 @@ dnl End of libgc checks
 dnl
 
 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
+
+                       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
+                               jdk_headers_found=no
+                       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
+       fi
+
+       AC_SUBST(ikvm_jni_dir)
+       AC_SUBST(IKVM_JNI_CFLAGS)
+
+       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)
+
        dnl ******************************************************************
        dnl *** Check for large file support                               ***
        dnl *** (If we were using autoconf 2.50 we'd use AC_SYS_LARGEFILE) ***
@@ -327,6 +461,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 *****************************
@@ -383,6 +532,20 @@ if test x$platform_win32 = xno; then
                        AC_MSG_RESULT(no)
                ])
        ])
+       
+       dnl **********************************
+       dnl *** Check for gethostbyname2_r ***
+       dnl **********************************
+       AC_MSG_CHECKING(for gethostbyname2_r)
+               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 *****************************
        dnl *** Checks for libnsl     ***
@@ -415,6 +578,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 *****************************
@@ -441,7 +621,9 @@ if test x$platform_win32 = xno; then
        dnl *** Checks for libpthread ***
        dnl *****************************
        AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+       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;
@@ -453,11 +635,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_nptl" != "xyes"; 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_DEFINE(HAVE_KW_THREAD)
+               ], [
+                               AC_MSG_RESULT(no)
+               ])
+       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 **
@@ -484,11 +814,93 @@ if test x$platform_win32 = xno; then
                        AC_ERROR(unable to find a way to determine timezone)
                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_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'])
 else
        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?))
 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_CHECK_FUNCS(truncl, , AC_MSG_CHECKING(for truncl in math.h)
+       AC_TRY_LINK([#include <math.h>], 
+       [ truncl(0.0); ], 
+       [
+               AC_DEFINE(HAVE_TRUNCL) 
+               AC_MSG_RESULT(yes)
+               ac_cv_truncl=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 ****************************
 dnl *** Look for /dev/random ***
 dnl ****************************
@@ -550,7 +962,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
  
@@ -562,21 +975,138 @@ if test "x$try_shared_handles" != "xyes"; then
        AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
+ICU_CFLAGS=""
+ICU_LIBS=""
+enable_icu=no
+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
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
 JIT_SUPPORTED=no
+LIBC="libc.so.6"
+
+jit_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
+               jit_wanted=true
+               ;;
+       x86_64-*-* | amd64-*-*)
+               TARGET=AMD64;
+               arch_target=amd64;
+               JIT_SUPPORTED=no
+               ;;
+       sparc*-*-*)
+               TARGET=SPARC;
+               arch_target=sparc;
+               JIT_SUPPORTED=yes
+               ACCESS_UNALIGNED="no"
+               jit_wanted=true
+               ;;
+#       alpha*-*-linux* | alpha*-*-osf*)
+#              TARGET=ALPHA;
+#              ACCESS_UNALIGNED="no"
+#             ;;
+#      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; 
+               ACCESS_UNALIGNED="no"
+               ;;
+       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"
+               JIT_SUPPORTED=yes
+               ;;
+esac
+
+AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that default to the JIT],[
+       jit_wanted=true
+])
+
+USEJIT=false
+if test x$JIT_SUPPORTED = xyes; then
+   if $jit_wanted; then
+      USEJIT=true
+      jit_status="Building and using the JIT"
+   else
+      jit_status="Building the JIT, defaulting to the interpreter"
+   fi
+else
+   jit_status="interpreter"
+fi
+
+AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
+
+libsuffix=".so"
 
 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";;
+     powerpc-*-darwin*)
+       libsuffix=".dylib"
+       ;;
 esac
+AC_SUBST(libsuffix)
+
+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"
@@ -591,15 +1121,17 @@ 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(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(HPPA, test x$TARGET = xHPPA)
 
 AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
 
-LIBC="libc.so.6"
 AC_SUBST(LIBC)
 
 AC_SUBST(arch_target)
@@ -609,6 +1141,7 @@ AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
 Makefile
+mint.pc
 mono.pc
 mono/Makefile
 mono/utils/Makefile
@@ -620,6 +1153,8 @@ 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
@@ -627,23 +1162,35 @@ 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
 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
 scripts/Makefile
 man/Makefile
-doc/Makefile
+web/Makefile
 docs/Makefile
 data/Makefile
+samples/Makefile
+support/Makefile
+data/config
 mono.spec
 ])
 
 echo "
 
-       GC:     $gc
-
+       GC:          $gc
+       ICU:         $enable_icu
+       NPTL:        $with_nptl
+       SIGALTSTACK: $with_sigaltstack
+       Engine:      $jit_status
+       
 "