update
[mono.git] / configure.in
index 0d1f677277313aa9c44fddab60bb44ecd627f9e4..248763c5a0df1053c334c050ec95922e3e0d9512 100644 (file)
@@ -1,9 +1,11 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.28.99)
+AM_INIT_AUTOMAKE(mono,1.0)
 AM_MAINTAINER_MODE
 
+AC_PROG_LN_S
+
 dnl
 dnl libgc checks
 dnl
@@ -27,21 +29,33 @@ 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)
+               AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
                CC="gcc -mno-cygwin"
                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 
+               with_nptl=no
+               with_sigaltstack=no
+               LN_S=cp
+
                ;;
        *-*-*netbsd*)
                platform_win32=no
@@ -49,25 +63,25 @@ 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=pthreads
+               libgc_threads=no
                ;;
        *-*-*freebsd*|*-*-*openbsd*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
+               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
@@ -80,26 +94,27 @@ case "$host" in
                libmono_cflags="-D_REENTRANT"
                libmono_ldflags="-lpthread"
                libgc_threads=pthreads
-               AC_DEFINE(NEED_LINK_UNLINK)
+               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=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!])
@@ -108,6 +123,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)
@@ -145,6 +165,15 @@ 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
@@ -162,6 +191,8 @@ AC_CHECK_SIZEOF(void *, 4)
 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.
@@ -215,10 +246,15 @@ AC_SUBST(GMODULE_LIBS)
 
 AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
 
-# 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 Enable support for NPTL])
+# Enable support for fast thread-local storage
+# Some systems have broken support, so we allow to disable it.
+# This is misnamed: __thread support has no relation to NPTL,
+# but people already use it...
+AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for __thread support],[],[with_nptl=yes])
+
+# 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])
 
 # assembly bundle support, see metadata/make-bundle.pl for more info
 AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
@@ -252,6 +288,10 @@ case "x$gc" in
                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)
@@ -273,6 +313,7 @@ case "x$gc" in
 
                # The included libgc contains GCJ support
                AC_DEFINE(HAVE_GC_GCJ_MALLOC)
+               AC_DEFINE(HAVE_GC_ENABLE)
                ;;
 
        xnone)
@@ -283,9 +324,9 @@ 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)
@@ -297,6 +338,68 @@ 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
+                       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
+       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) ***
@@ -461,6 +564,8 @@ if test x$platform_win32 = xno; then
                # Yes, we have it...
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_GETHOSTBYNAME2_R)
+       ], [
+               AC_MSG_RESULT(no)
        ])
 
        dnl *****************************
@@ -539,6 +644,7 @@ if test x$platform_win32 = xno; then
        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;
@@ -556,50 +662,153 @@ if test x$platform_win32 = xno; then
        dnl *** Checks for working __thread ***
        dnl ***********************************
        AC_MSG_CHECKING(for working __thread)
-       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);
-               }
+       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;
+                       int main () {
+                               pthread_t t1, t2;
 
-                       i = 5;
+                               i = 5;
 
-                       pthread_create (&t1, NULL, thread_main, 1);
-                       pthread_create (&t2, NULL, thread_main, 2);
+                               pthread_create (&t1, NULL, thread_main, 1);
+                               pthread_create (&t2, NULL, thread_main, 2);
 
-                       pthread_join (t1, NULL);
-                       pthread_join (t2, NULL);
+                               pthread_join (t1, NULL);
+                               pthread_join (t2, NULL);
 
-                       return !(res1 + res2 == 2);
-               }
-       ], [
-                       if test "x$with_nptl" = "x"; then
-                               AC_MSG_RESULT(disabled)
-                       else
+                               return !(res1 + res2 == 2);
+                       }
+               ], [
                                AC_MSG_RESULT(yes)
                                AC_DEFINE(HAVE_KW_THREAD)
-                       fi
-       ], [
-                       AC_MSG_RESULT(no)
-       ])
+               ], [
+                               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 **
@@ -652,7 +861,7 @@ if test x$platform_win32 = xno; then
        dnl *** Check for signbit ***
        dnl *************************
        AC_MSG_CHECKING(for signbit)
-       AC_TRY_COMPILE([#include <math.h>], [
+       AC_TRY_LINK([#include <math.h>], [
                int s = signbit(1.0);
        ], [
                AC_MSG_RESULT(yes)
@@ -660,9 +869,102 @@ 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)
+       ])
+
+       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
 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?))
+
+       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_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
+       AC_TRY_LINK([#include <math.h>], 
+       [ trunc(0.0); ], 
+       [
+               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 ****************************
@@ -683,7 +985,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
@@ -726,7 +1028,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
  
@@ -738,17 +1041,32 @@ if test "x$try_shared_handles" != "xyes"; then
        AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
+#
+# ICU 
+#
 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])
-else
-       enable_icu="yes. Version: `$ICU_CONFIG --version`"
-       AC_DEFINE(HAVE_ICU)
-       ICU_CFLAGS=`$ICU_CONFIG --cppflags`
-       ICU_LIBS=`$ICU_CONFIG --ldflags`
+
+probe_icu=true
+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 $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)
@@ -758,7 +1076,9 @@ ACCESS_UNALIGNED="yes"
 
 JIT_SUPPORTED=no
 LIBC="libc.so.6"
+INTL="libc.so.6"
 
+jit_wanted=false
 case "$host" in
 #      mips-sgi-irix5.* | mips-sgi-irix6.*)
 #              TARGET=MIPS;
@@ -768,16 +1088,28 @@ case "$host" in
                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"
+               LIBC="libc.so"
+               INTL="libintl.so"
+               jit_wanted=true
                ;;
-#       alpha*-*-linux* | alpha*-*-osf*)
-#              TARGET=ALPHA;
-#              ACCESS_UNALIGNED="no"
-#             ;;
+       alpha*-*-linux* | alpha*-*-osf*)
+               TARGET=ALPHA;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=no
+               arch_target=alpha;
+              ;;
 #      ia64-*-linux* | ia64-*-hpux*)
 #              TARGET=IA64;
 #              arch_target=ia64;
@@ -792,6 +1124,12 @@ case "$host" in
 #              TARGET=M68K
 #              ;;
        hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00)
+               TARGET=HPPA;
+               arch_target=hppa; 
+               LIBC="libc.sl"
+               ACCESS_UNALIGNED="no"
+               ;;
+       hppa*linux*)
                TARGET=HPPA;
                arch_target=hppa; 
                ACCESS_UNALIGNED="no"
@@ -801,6 +1139,7 @@ case "$host" in
                TARGET=POWERPC;
                arch_target=ppc;
                JIT_SUPPORTED=yes
+               jit_wanted=true
                ;;
        arm-*-linux-* | armv4l-*-linux-*)
                TARGET=ARM;
@@ -811,9 +1150,43 @@ case "$host" in
                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
+     powerpc-*-darwin*)
+       libsuffix=".dylib"
+       LIBC="libc.dylib"
+       INTL="libintl.dylib"
+       ;;
+     *-*-*netbsd*)
+       LIBC="libc.so.12"
+       INTL="libintl.so.0"
+       ;;
+esac
+AC_SUBST(libsuffix)
+
 if test ${TARGET} = ARM; then
        dnl ******************************************
        dnl *** Check to see what FPU is available ***
@@ -842,10 +1215,20 @@ 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(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)
@@ -857,6 +1240,7 @@ AM_CONDITIONAL(HPPA, test x$TARGET = xHPPA)
 AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
 
 AC_SUBST(LIBC)
+AC_SUBST(INTL)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
@@ -865,6 +1249,7 @@ AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
 Makefile
+mint.pc
 mono.pc
 mono/Makefile
 mono/utils/Makefile
@@ -876,6 +1261,7 @@ 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
@@ -892,19 +1278,31 @@ 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
+tools/Makefile
+tools/locale-builder/Makefile
 ])
 
 echo "
 
-       GC:     $gc
-       ICU:    $enable_icu
+       GC:          $gc
+       ICU:         $enable_icu
+       __thread:    $with_nptl
+       SIGALTSTACK: $with_sigaltstack
+       Engine:      $jit_status
+       2.0 Alpha:   $PREVIEW
+       JNI support: $jdk_headers_found
+
 "