Add new field that reflects changes to corlib for remoting

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 7ee0a73a7800352ac5ca59566e8cb39eac3e5c0e..d5b43f2b7ddb976562abfc8d0007d68d8766c0a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.16)
+AM_INIT_AUTOMAKE(mono, 0.17)
 AM_MAINTAINER_MODE
 
 # Thread configuration inspired by sleepycat's db
@@ -20,11 +20,13 @@ case "$host" in
                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
                LDFLAGS="$LDFLAGS -pthread"
                AC_DEFINE(NEED_LINK_UNLINK)
+               AC_DEFINE(PTHREAD_POINTER_ID)
                libdl=
                ;;
        *-*-linux*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+               AC_DEFINE(MONO_USE_EXC_TABLES)
+               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -fexceptions"
                libdl="-ldl"
                ;;
        *-*-solaris*)
@@ -123,16 +125,20 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-AC_CHECK_HEADERS(gc.h gc/gc.h)
+gc_headers=no
+AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
 AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
 gc=auto
 AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
 case "x$gc" in
-       xboehm|xyes)
+       xboehm|xbohem|xyes)
                if test "x$found_boehm" != "xyes"; then
                        AC_MSG_ERROR("GC requested but libgc not found!")
                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.")
+               fi
 
                AC_DEFINE(HAVE_BOEHM_GC)
                AC_SUBST(HAVE_BOEHM_GC)
@@ -146,6 +152,9 @@ case "x$gc" in
                if test "x$found_boehm" != "xyes"; then
                        AC_MSG_WARN("Compiling mono without GC.")
                else
+                       if test "x$gc_headers" != "xyes"; then
+                               AC_MSG_ERROR("Found libgc but not its header files! You may need to install them by hand.")
+                       fi
                        AC_DEFINE(HAVE_BOEHM_GC)
                        AC_SUBST(HAVE_BOEHM_GC)
                        LIBS="$LIBS -lgc $libdl"
@@ -360,24 +369,24 @@ if test x$platform_win32 = xno; then
        dnl ********************************
        dnl *** Checks for timezone stuff **
        dnl ********************************
-       AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+       AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
                AC_TRY_COMPILE([
                        #include <time.h>
-               ], [
-                       timezone = 1;
-               ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-       if test $ac_cv_var_timezone = yes; then
-               AC_DEFINE(HAVE_TIMEZONE)
+                       ], [
+                       struct tm tm;
+                       tm.tm_gmtoff = 1;
+                       ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+       if test $ac_cv_struct_tm_gmtoff = yes; then
+               AC_DEFINE(HAVE_TM_GMTOFF)
        else
-               AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+               AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
                        AC_TRY_COMPILE([
                                #include <time.h>
-                               ], [
-                               struct tm tm;
-                               tm.tm_gmtoff = 1;
-                               ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-               if test $ac_cv_struct_tm_gmtoff = yes; then
-                       AC_DEFINE(HAVE_TM_GMTOFF)
+                       ], [
+                               timezone = 1;
+                       ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+               if test $ac_cv_var_timezone = yes; then
+                       AC_DEFINE(HAVE_TIMEZONE)
                else
                        AC_ERROR(unable to find a way to determine timezone)
                fi
@@ -471,6 +480,7 @@ sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
 macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
 arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
+s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";;
 esac
 
 if test ${TARGET} = unknown; then
@@ -490,6 +500,7 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
 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)
 
 LIBC="libc.so.6"
 AC_SUBST(LIBC)
@@ -513,6 +524,7 @@ mono/os/unix/Makefile
 mono/arch/x86/Makefile
 mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile
+mono/arch/s390/Makefile
 mono/arch/arm/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile